From: David Galloway <david.galloway@ibm.com>
Date: Thu, 9 Jul 2026 16:28:25 +0000 (-0400)
Subject: pulp_upload.sh: use the rpm arch for the repository handoff lookup
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f8da0bf8e81b1624af8caffc9625384a2bb29ed;p=ceph-build.git

pulp_upload.sh: use the rpm arch for the repository handoff lookup

The final `pulp repository show --name ${REPO_NAME}-${ARCH}` uses the
Jenkins matrix arch (arm64), but rpm repositories are created per rpm
arch (aarch64) by the upload loop.  For arm64 rpm builds the lookup
fails after all uploads succeeded and, under set -e, kills the script,
failing the stage.

Signed-off-by: David Galloway <david.galloway@ibm.com>
---

diff --git a/scripts/pulp_upload.sh b/scripts/pulp_upload.sh
index 68e1e1c14..38c39d8fc 100755
--- a/scripts/pulp_upload.sh
+++ b/scripts/pulp_upload.sh
@@ -539,8 +539,14 @@ fi
 # separate process. PACKAGE_MANAGER_VERSION is included in the repo
 # record's extra metadata; the repository's API URL becomes the record's
 # chacra_url. See notify_shaman_pulp_repo.sh.
+# rpm repositories are named after the rpm arch (aarch64), not the Jenkins
+# matrix arch (arm64); see the SRPMS/noarch/aarch64/x86_64 loop above.
+_repo_arch="${ARCH}"
+if [ "$OS_PKG_TYPE" = "rpm" ] && [ "$ARCH" = "arm64" ]; then
+    _repo_arch="aarch64"
+fi
 _repo_href=$(pulp "${OS_PKG_TYPE}" repository show \
-    --name "${REPO_NAME}-${ARCH}" | jq -r '.pulp_href')
+    --name "${REPO_NAME}-${_repo_arch}" | jq -r '.pulp_href')
 {
     printf 'PACKAGE_MANAGER_VERSION=%q\n' "${PACKAGE_MANAGER_VERSION}"
     printf 'PULP_REPO_API_URL=%q\n' "${PULP_SERVER_URL}${_repo_href}"