]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
container/build.sh: fix arm architecture tagging 60228/head
authorDan Mick <dmick@redhat.com>
Thu, 10 Oct 2024 23:38:58 +0000 (16:38 -0700)
committerLaura Flores <lflores@ibm.com>
Mon, 14 Oct 2024 15:08:12 +0000 (10:08 -0500)
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)

container/build.sh

index 7c97e2261c16f7b7a96db1887893cb0c68960348..5edf469d2d2e49d7efc7673e260b8471907a11e2 100755 (executable)
@@ -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}