[arvados] updated: 2.6.0-409-g7c3c271a6

git repository hosting git at public.arvados.org
Tue Aug 1 17:18:07 UTC 2023


Summary of changes:
 build/package-build-dockerfiles/rocky8/Dockerfile         | 2 +-
 build/package-test-dockerfiles/rocky8/Dockerfile          | 2 +-
 build/package-testing/common-test-rails-server-package.sh | 4 ++--
 build/package-testing/rpm-common-test-packages.sh         | 4 ++--
 doc/install/install-postgresql.html.textile.liquid        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

       via  7c3c271a6616e9795581a27f7e5515b03b43a460 (commit)
       via  8ea9c22dd8c5986d1a5eb7a45c223c051a0fc571 (commit)
      from  1cefd714aed3090435b6fe471dbdf3a1ba12179a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7c3c271a6616e9795581a27f7e5515b03b43a460
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Aug 1 12:06:59 2023 -0400

    20797: Run microdnf with --assumeyes
    
    `docker run --rm -ti rockylinux:8-minimal microdnf --help` says,
    
    > The "--assumeyes" option is turned on by default.
    
    However, that behavior apparently changes in a future version:
    <https://github.com/rpm-software-management/microdnf/pull/97>,
    microdnf commit ca778a0b34c5e15b5b0de1e0af0f8892280fc0c2.
    
    Passing `--assumeyes` provides more consistency and will help keep the
    code working in later releases.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/package-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile
index 21e131348..217de9140 100644
--- a/build/package-build-dockerfiles/rocky8/Dockerfile
+++ b/build/package-build-dockerfiles/rocky8/Dockerfile
@@ -29,7 +29,7 @@ FROM build_${HOSTTYPE}
 MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
 
 # Install dependencies.
-RUN microdnf --enablerepo=devel install \
+RUN microdnf --assumeyes --enablerepo=devel install \
     automake \
     bison \
     bzip2 \
diff --git a/build/package-test-dockerfiles/rocky8/Dockerfile b/build/package-test-dockerfiles/rocky8/Dockerfile
index 0ce313374..c8f75ae0e 100644
--- a/build/package-test-dockerfiles/rocky8/Dockerfile
+++ b/build/package-test-dockerfiles/rocky8/Dockerfile
@@ -6,7 +6,7 @@ FROM rockylinux:8.6-minimal
 MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
 
 # Install dependencies.
-RUN microdnf --enablerepo=devel install \
+RUN microdnf --assumeyes --enablerepo=devel install \
     autoconf \
     automake \
     bison \
diff --git a/build/package-testing/common-test-rails-server-package.sh b/build/package-testing/common-test-rails-server-package.sh
index a60fcc465..93e32637d 100755
--- a/build/package-testing/common-test-rails-server-package.sh
+++ b/build/package-testing/common-test-rails-server-package.sh
@@ -48,8 +48,8 @@ case "$TARGET" in
         yum reinstall --assumeyes "$PACKAGE_NAME"
         ;;
     rocky*)
-        microdnf install httpd
-        microdnf reinstall "$PACKAGE_NAME"
+        microdnf --assumeyes install httpd
+        microdnf --assumeyes reinstall "$PACKAGE_NAME"
         ;;
     *)
         echo -e "$0: Unknown target '$TARGET'.\n" >&2
diff --git a/build/package-testing/rpm-common-test-packages.sh b/build/package-testing/rpm-common-test-packages.sh
index 7cd2be7cd..fb13eff33 100755
--- a/build/package-testing/rpm-common-test-packages.sh
+++ b/build/package-testing/rpm-common-test-packages.sh
@@ -19,7 +19,7 @@ target="${target##*-}"
 
 case "$target" in
     centos*) yum -q clean all ;;
-    rocky*) microdnf clean all ;;
+    rocky*) microdnf --assumeyes clean all ;;
 esac
 touch /var/lib/rpm/*
 
@@ -29,7 +29,7 @@ rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.before"
 
 case "$target" in
     centos*) yum install --assumeyes -e 0 $1 ;;
-    rocky*) microdnf install $1 ;;
+    rocky*) microdnf --assumeyes install $1 ;;
 esac
 
 rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.after"

commit 8ea9c22dd8c5986d1a5eb7a45c223c051a0fc571
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Aug 1 12:02:30 2023 -0400

    20797: Prefer dnf in PostgreSQL install instructions
    
    I believe this is the current preferred tool, and provides consistency
    with other RH8 documentation.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/doc/install/install-postgresql.html.textile.liquid b/doc/install/install-postgresql.html.textile.liquid
index 35ba41ad0..56ad95635 100644
--- a/doc/install/install-postgresql.html.textile.liquid
+++ b/doc/install/install-postgresql.html.textile.liquid
@@ -43,7 +43,7 @@ The default version on RH8 is PostgreSQL 10. You can install up to PostgreSQL 13
 {% endcomment %}
 
 # Install PostgreSQL
-  <notextile><pre># <span class="userinput">yum install postgresql-server postgresql-contrib</span></pre></notextile>
+  <notextile><pre># <span class="userinput">dnf install postgresql-server postgresql-contrib</span></pre></notextile>
 # Initialize the database
   <notextile><pre># <span class="userinput">postgresql-setup initdb</span></pre></notextile>
 # Configure the database to accept password connections from localhost

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list