Add an architecture suffix to images pushed for multi-platform

In order to reduce the likelihood of users accidentally forgetting to specify unique tags for each architecture, we can add a suffix to the pushed image if an arch-specific one doesn't exist. Signed-off-by: arewm <[email protected]>
konflux-ci · Jul 23, 2024 · 9c611cd · 9c611cd
1 parent 6dd763a
commit 9c611cd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/task-generator/remote/main.go b/task-generator/remote/main.go
@@ -123,6 +123,10 @@ mkdir -p scripts
 echo "$BUILD_DIR"
 ssh $SSH_ARGS "$SSH_HOST"  mkdir -p "$BUILD_DIR/workspaces" "$BUILD_DIR/scripts" "$BUILD_DIR/volumes"
 
+if [ "${IMAGE##*-}" != "${PLATFORM##*-}" ]; then
+	export IMAGE="${IMAGE}-${PLATFORM##*-}"
+fi
+
 PORT_FORWARD=""
 PODMAN_PORT_FORWARD=""
 if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] ; then

diff --git a/task/buildah-remote-oci-ta/0.1/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.1/buildah-remote-oci-ta.yaml
@@ -234,6 +234,10 @@ spec:
       echo "$BUILD_DIR"
       ssh $SSH_ARGS "$SSH_HOST"  mkdir -p "$BUILD_DIR/workspaces" "$BUILD_DIR/scripts" "$BUILD_DIR/volumes"
 
+      if [ "${IMAGE##*-}" != "${PLATFORM##*-}" ]; then
+        export IMAGE="${IMAGE}-${PLATFORM##*-}"
+      fi
+
       PORT_FORWARD=""
       PODMAN_PORT_FORWARD=""
       if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] ; then

diff --git a/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml
@@ -230,6 +230,10 @@ spec:
       echo "$BUILD_DIR"
       ssh $SSH_ARGS "$SSH_HOST"  mkdir -p "$BUILD_DIR/workspaces" "$BUILD_DIR/scripts" "$BUILD_DIR/volumes"
 
+      if [ "${IMAGE##*-}" != "${PLATFORM##*-}" ]; then
+        export IMAGE="${IMAGE}-${PLATFORM##*-}"
+      fi
+
       PORT_FORWARD=""
       PODMAN_PORT_FORWARD=""
       if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] ; then

diff --git a/task/buildah-remote/0.1/buildah-remote.yaml b/task/buildah-remote/0.1/buildah-remote.yaml
@@ -222,6 +222,10 @@ spec:
       echo "$BUILD_DIR"
       ssh $SSH_ARGS "$SSH_HOST"  mkdir -p "$BUILD_DIR/workspaces" "$BUILD_DIR/scripts" "$BUILD_DIR/volumes"
 
+      if [ "${IMAGE##*-}" != "${PLATFORM##*-}" ]; then
+        export IMAGE="${IMAGE}-${PLATFORM##*-}"
+      fi
+
       PORT_FORWARD=""
       PODMAN_PORT_FORWARD=""
       if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] ; then

diff --git a/task/buildah-remote/0.2/buildah-remote.yaml b/task/buildah-remote/0.2/buildah-remote.yaml
@@ -212,6 +212,10 @@ spec:
       echo "$BUILD_DIR"
       ssh $SSH_ARGS "$SSH_HOST"  mkdir -p "$BUILD_DIR/workspaces" "$BUILD_DIR/scripts" "$BUILD_DIR/volumes"
 
+      if [ "${IMAGE##*-}" != "${PLATFORM##*-}" ]; then
+        export IMAGE="${IMAGE}-${PLATFORM##*-}"
+      fi
+
       PORT_FORWARD=""
       PODMAN_PORT_FORWARD=""
       if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] ; then