Skip to content

Commit

Permalink
update the arm to arm64 (#676)
Browse files Browse the repository at this point in the history
Co-authored-by: Praneeth Bajjuri <[email protected]>
  • Loading branch information
pbajjuri20 and Praneeth Bajjuri authored Apr 3, 2024
1 parent 885efba commit 2f70580
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```


Expand Down
30 changes: 15 additions & 15 deletions images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,90 +2,90 @@

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

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
2 changes: 1 addition & 1 deletion pkg/tests/ossm/testssl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/test/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
type TestGroup string

const (
ARM TestGroup = "arm"
ARM TestGroup = "arm64"
Full TestGroup = "full"
Smoke TestGroup = "smoke"
InterOp TestGroup = "interop"
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 2f70580

Please sign in to comment.