[arvados] updated: 2.7.2-3-g1c61a77568

[git repository hosting]

Summary of changes:
 build/package-testing/rpm-common-test-packages.sh | 4 ++++
 build/run-library.sh                              | 7 +++++++
 2 files changed, 11 insertions(+)

       via  1c61a775680970a5ee8b5e8080fa96120113b7cf (commit)
      from  dc5cde27d1b100aea87afeb2c4bfc66e2bf07676 (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 1c61a775680970a5ee8b5e8080fa96120113b7cf
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Apr 16 11:12:47 2024 -0400

    Merge branch '21692-go-packages-no-build-id'
    
    Refs #21692. Closes #21694.
    
    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 fb13eff33c..ac0c99a966 100755
--- a/build/package-testing/rpm-common-test-packages.sh
+++ b/build/package-testing/rpm-common-test-packages.sh
@@ -55,6 +55,10 @@ fi
 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
diff --git a/build/run-library.sh b/build/run-library.sh
index ed5bcc5ab7..63411a3927 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -247,6 +247,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
--