From 4806d8f4bedf076343f0dbc4f7ec92c6c0e7d201 Mon Sep 17 00:00:00 2001
From: James Blair <mail@jamesblair.net>
Date: Sat, 1 Apr 2023 12:13:20 +1300
Subject: [PATCH] Simplify etcd image release process.

Only test and publish the single multi arch image.

Signed-off-by: James Blair <mail@jamesblair.net>
---
 scripts/release.sh     |  7 -------
 scripts/test_images.sh | 15 ++-------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index 7eddc29ab92b..47e840f21df9 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -258,13 +258,6 @@ main() {
       log_warning "login failed, retrying"
     done
 
-    for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
-      log_callout "Pushing container images to quay.io ${RELEASE_VERSION}-${TARGET_ARCH}"
-      maybe_run docker push "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
-      log_callout "Pushing container images to gcr.io ${RELEASE_VERSION}-${TARGET_ARCH}"
-      maybe_run docker push "gcr.io/etcd-development/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
-    done
-
     log_callout "Creating manifest-list (multi-image)..."
 
     for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
diff --git a/scripts/test_images.sh b/scripts/test_images.sh
index 04d5e1e1e20d..0389b0e46295 100755
--- a/scripts/test_images.sh
+++ b/scripts/test_images.sh
@@ -37,8 +37,7 @@ if [[ $(go env GOOS) == "darwin" ]]; then
 fi
 
 # Pick defaults based on release workflow
-ARCH=$(go env GOARCH)
-REPOSITARY=${REPOSITARY:-"gcr.io/etcd-development/etcd"}
+REPOSITORY=${REPOSITORY:-"gcr.io/etcd-development/etcd"}
 if [ -n "$VERSION" ]; then
     # Expected Format: v3.6.99-amd64
     TAG=v"${VERSION}"-"${ARCH}"
@@ -46,7 +45,7 @@ else
     echo "Terminating test, VERSION not supplied"
     exit 1
 fi
-IMAGE=${IMAGE:-"${REPOSITARY}:${TAG}"}
+IMAGE=${IMAGE:-"${REPOSITORY}:${TAG}"}
 
 # ETCD related values
 RUN_NAME="test_etcd"
@@ -82,13 +81,3 @@ if [ "${GET}" != "${VALUE}" ]; then
 fi
 
 echo "Succesfully tested etcd local image ${TAG}"
-
-for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
-    ARCH_TAG=v"${VERSION}"-"${TARGET_ARCH}"
-    IMG_ARCH=$(docker inspect --format '{{.Architecture}}' "${REPOSITARY}:${ARCH_TAG}")
-    if [ "${IMG_ARCH}" != "$TARGET_ARCH" ];then
-        echo "Incorrect docker image architecture"
-        exit 1
-    fi
-    echo "Correct Architecture ${ARCH_TAG}"
-done