OCPBUGS-19853: improve support for multi architecture test cases

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
openshift · Mar 19, 2024 · 9747491 · 9747491
1 parent dff1e9f
commit 9747491
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/test/e2e/e2e-simple.sh b/test/e2e/e2e-simple.sh
@@ -30,7 +30,8 @@ OCI_REGISTRY_NAMESPACE="${ENV_OCI_REGISTRY_NAMESPACE:-redhatgov}"
 CATALOG_ARCH="$(arch | sed 's|aarch64|arm64|g')"
 if [ "${CATALOG_ARCH}" == "x86_64" ]
 then
-    OCI_CTLG_PATH="oc-mirror-dev"
+    OCI_CTLG="oc-mirror-dev"
+    OCI_CTLG_PATH="oc-mirror-dev.tgz"
 else
     OCI_CTLG="oc-mirror-${CATALOG_ARCH}-dev"
     OCI_CTLG_PATH="oc-mirror-${CATALOG_ARCH}-dev.tgz"

diff --git a/test/e2e/lib/util.sh b/test/e2e/lib/util.sh
@@ -216,7 +216,12 @@ function setup_helm_repository_testdata() {
   export HELM_REPOSITORY_CACHE=$DATA_DIR
   echo -e "\nSetting up test directory in $DATA_DIR"
   mkdir -p "$OUTPUT_DIR"
-  curl -L https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-${CATALOG_ARCH} -o ./helm
+  if [ "${CATALOG_ARCH}" == "x86_64" ]
+  then
+    curl -L https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-amd64 -o ./helm
+  else
+    curl -L https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-${CATALOG_ARCH} -o ./helm
+  fi
   chmod +x ./helm
   ./helm repo add sbo https://redhat-developer.github.io/service-binding-operator-helm-chart/
   cp "${DIR}/configs/${CONFIG_PATH}" "${OUTPUT_DIR}/"