[arvados] created: 2.7.0-6422-gd35808f8df

[git repository hosting]

        at  d35808f8df98545d42b692e25343636a86de4a57 (commit)


commit d35808f8df98545d42b692e25343636a86de4a57
Author: Brett Smith <brett.smith at curii.com>
Date:   Fri Apr 12 14:56:45 2024 -0400

    21692: Test RPM packages for build id conflicts
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/package-testing/rpm-common-test-packages.sh b/build/package-testing/rpm-common-test-packages.sh
index cd41f1d920..b6d7fec468 100755
--- a/build/package-testing/rpm-common-test-packages.sh
+++ b/build/package-testing/rpm-common-test-packages.sh
@@ -30,6 +30,10 @@ diff "$ARV_PACKAGES_DIR/$1".{before,after} >"$ARV_PACKAGES_DIR/$1.diff" || true
 mkdir -p /tmp/opts
 cd /tmp/opts
 
+# Install other packages alongside to test for build id conflicts.
+# This line can be removed after we have test-provision-rocky8, #21426.
+microdnf --assumeyes install arvados-client arvados-server python3-arvados-python-client
+
 rpm2cpio $(ls -t "$ARV_PACKAGES_DIR/$1"-*.rpm | head -n1) | cpio -idm 2>/dev/null
 
 if [[ "$DEBUG" != "0" ]]; then

commit 5384f78c59c99c76d6aa892b129257c8b7361694
Author: Brett Smith <brett.smith at curii.com>
Date:   Fri Apr 12 14:21:20 2024 -0400

    21692: Don't include build id links in Go packages
    
    See comment for rationale.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 6380e1cb19..03d99b1327 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -262,6 +262,13 @@ package_go_binary_worker() {
       binpath="$GOPATH/bin/linux_${target_arch}/${basename}"
     fi
 
+    case "$package_format" in
+        # As of April 2024 we package identical Go binaries under different
+        # packages and names. This upsets the build id database, so don't
+        # register ourselves there.
+        rpm) switches+=(--rpm-rpmbuild-define="_build_id_links none") ;;
+    esac
+
     systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
     if [[ -e "${systemd_unit}" ]]; then
         switches+=(

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


hooks/post-receive
--