From 2f7058059ff3b60f01795a04a2c21f16d7ef8909 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 3 Apr 2024 02:10:02 -0500 Subject: [PATCH] update the arm to arm64 (#676) Co-authored-by: Praneeth Bajjuri --- README.md | 2 +- images.yaml | 30 +++++++++++++++--------------- pkg/tests/ossm/testssl_test.go | 2 +- pkg/util/test/test.go | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e7c783b9..20af2ddc 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ OCP_ARCH=z make test For ARM-based clusters, run tests with: ``` -OCP_ARCH=arm make test +OCP_ARCH=arm64 make test ``` diff --git a/images.yaml b/images.yaml index 4bffa1b6..0991f405 100644 --- a/images.yaml +++ b/images.yaml @@ -2,79 +2,79 @@ bookinfo-mongodb: x86: quay.io/maistra/examples-bookinfo-mongodb:2.4.0 - arm: quay.io/maistra/examples-bookinfo-mongodb:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-mongodb:2.4.0 p: quay.io/maistra/examples-bookinfo-mongodb:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-mongodb:2.4.0-z bookinfo-productpage-v1: x86: quay.io/maistra/examples-bookinfo-productpage-v1:2.4.0 - arm: quay.io/maistra/examples-bookinfo-productpage-v1:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-productpage-v1:2.4.0 p: quay.io/maistra/examples-bookinfo-productpage-v1:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-productpage-v1:2.5.0-ibm-z bookinfo-details-v1: x86: quay.io/maistra/examples-bookinfo-details-v1:2.4.0 - arm: quay.io/maistra/examples-bookinfo-details-v1:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-details-v1:2.4.0 p: quay.io/maistra/examples-bookinfo-details-v1:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-details-v1:2.5.0-ibm-z bookinfo-ratings-v1: x86: quay.io/maistra/examples-bookinfo-ratings-v1:2.4.0 - arm: quay.io/maistra/examples-bookinfo-ratings-v1:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-ratings-v1:2.4.0 p: quay.io/maistra/examples-bookinfo-ratings-v1:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-ratings-v1:2.5.0-ibm-z bookinfo-ratings-v2: x86: quay.io/maistra/examples-bookinfo-ratings-v2:2.4.0 - arm: quay.io/maistra/examples-bookinfo-ratings-v2:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-ratings-v2:2.4.0 p: quay.io/maistra/examples-bookinfo-ratings-v2:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-ratings-v2:2.5.0-ibm-z bookinfo-reviews-v1: x86: quay.io/maistra/examples-bookinfo-reviews-v1:2.4.0 - arm: quay.io/maistra/examples-bookinfo-reviews-v1:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-reviews-v1:2.4.0 p: quay.io/maistra/examples-bookinfo-reviews-v1:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-reviews-v1:2.5.0-ibm-z bookinfo-reviews-v2: x86: quay.io/maistra/examples-bookinfo-reviews-v2:2.4.0 - arm: quay.io/maistra/examples-bookinfo-reviews-v2:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-reviews-v2:2.4.0 p: quay.io/maistra/examples-bookinfo-reviews-v2:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-reviews-v2:2.5.0-ibm-z bookinfo-reviews-v3: x86: quay.io/maistra/examples-bookinfo-reviews-v3:2.4.0 - arm: quay.io/maistra/examples-bookinfo-reviews-v3:2.4.0 + arm64: quay.io/maistra/examples-bookinfo-reviews-v3:2.4.0 p: quay.io/maistra/examples-bookinfo-reviews-v3:2.5.0-ibm-p z: quay.io/maistra/examples-bookinfo-reviews-v3:2.5.0-ibm-z httpbin: x86: quay.io/openshifttest/httpbin:multiarch - arm: quay.io/openshifttest/httpbin:multiarch + arm64: quay.io/openshifttest/httpbin:multiarch p: quay.io/maistra/kennethreitz-httpbin:0.0-ibm-p z: quay.io/maistra/httpbin:0.0-ibm-z sleep: x86: quay.io/openshifttest/sleep:multiarch - arm: quay.io/openshifttest/sleep:multiarch + arm64: quay.io/openshifttest/sleep:multiarch p: quay.io/maistra/governmentpaas-curl-ssl:0.0-ibm-p z: quay.io/maistra/governmentpaas-curl-ssl:0.0-ibm-z tcp-echo: x86: docker.io/istio/tcp-echo-server:1.2 - arm: docker.io/h0tbird/tcp-echo-server:1.2 + arm64: docker.io/h0tbird/tcp-echo-server:1.2 p: quay.io/maistra/tcp-echo-server:0.0-ibm-p z: quay.io/maistra/tcp-echo-server:2.0-ibm-z fortio: x86: fortio/fortio:latest_release - arm: docker.io/fortio/fortio:latest + arm64: docker.io/fortio/fortio:latest p: quay.io/maistra/fortio.test:0.0-ibm-p z: quay.io/maistra/fortio:0.0-ibm-z testssl: x86: quay.io/maistra/testssl:latest - arm: quay.io/maistra/testssl:2.5 + arm64: quay.io/maistra/testssl:2.5 p: quay.io/maistra/testssl:0.0-ibm-p z: quay.io/maistra/testssl:0.0-ibm-z @@ -82,10 +82,10 @@ helloworld: x86: quay.io/jewertow/examples-helloworld-v1 p: quay.io/maistra/helloworld-v1:0.0-ibm-p z: quay.io/maistra/helloworld-v1:0.0-ibm-z - arm: docker.io/tanjunchen/helloworld-v1:latest-arm + arm64: docker.io/tanjunchen/helloworld-v1:latest-arm ext-authz: x86: gcr.io/istio-testing/ext-authz:latest p: quay.io/maistra/ext-authz:0.0-ibm-p z: quay.io/maistra/ext-authz:1.1-ibm-z - arm: docker.io/istio/ext-authz:1.21.0 + arm64: docker.io/istio/ext-authz:1.21.0 diff --git a/pkg/tests/ossm/testssl_test.go b/pkg/tests/ossm/testssl_test.go index cdc2a341..c3f1a368 100644 --- a/pkg/tests/ossm/testssl_test.go +++ b/pkg/tests/ossm/testssl_test.go @@ -71,7 +71,7 @@ spec: t.LogStep("Check testssl.sh results") command := "./testssl/testssl.sh -P -6 productpage:9080 || true" - if env.GetArch() == "arm" { + if env.GetArch() == "arm64" { command = "./testssl.sh -P -6 productpage:9080 || true" } retry.UntilSuccessWithOptions(t, retry.Options().MaxAttempts(10), func(t TestHelper) { diff --git a/pkg/util/test/test.go b/pkg/util/test/test.go index ea91f3f2..7ec62330 100644 --- a/pkg/util/test/test.go +++ b/pkg/util/test/test.go @@ -14,7 +14,7 @@ import ( type TestGroup string const ( - ARM TestGroup = "arm" + ARM TestGroup = "arm64" Full TestGroup = "full" Smoke TestGroup = "smoke" InterOp TestGroup = "interop" @@ -106,8 +106,8 @@ func captureMustGather(t *testing.T) { func (t *topLevelTest) skipIfNecessary() { testGroup := TestGroup(env.GetTestGroup()) - if env.GetArch() == "arm" { - testGroup = "arm" + if env.GetArch() == "arm64" { + testGroup = "arm64" } if !t.isPartOfGroup(testGroup) {