From: Dan Mick <dmick@redhat.com>
Date: Thu, 10 Oct 2024 23:38:58 +0000 (-0700)
Subject: container/build.sh: fix arm architecture tagging
X-Git-Tag: v17.2.8~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60230%2Fhead;p=ceph.git

container/build.sh: fix arm architecture tagging

The wrong string was used for comparison, and for tagging,
so the arm64 branch and sha1 images overwrote and destroyed
the amd64 images.

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit 7e03ee798f4ed3aa4a0bb1a9e9d62df52e54406d)
---

diff --git a/container/build.sh b/container/build.sh
index 7c97e2261c16..5edf469d2d2e 100755
--- a/container/build.sh
+++ b/container/build.sh
@@ -136,9 +136,9 @@ if [[ ${CI_CONTAINER} == "true" ]] ; then
     branch_repo_tag=$repopath/ceph:${BRANCH}
     sha1_repo_tag=$repopath/ceph:${CEPH_SHA1}
 
-    if [[ "${ARCH}" == "aarch64" ]] ; then
-        branch_repo_tag=${branch_repo_tag}-aarch64
-        sha1_repo_tag=${sha1_repo_tag}-aarch64
+    if [[ "${ARCH}" == "arm64" ]] ; then
+        branch_repo_tag=${branch_repo_tag}-arm64
+        sha1_repo_tag=${sha1_repo_tag}-arm64
     fi
 
     podman tag ${image_id} ${full_repo_tag}