Skip to content

Commit

Permalink
Update 2.5 ARM testssl test
Browse files Browse the repository at this point in the history
Signed-off-by: yxun <yuanlin.yxu@gmail.com>
  • Loading branch information
yxun committed Feb 1, 2024
1 parent db39455 commit bc51412
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ fortio:

testssl:
x86: quay.io/maistra/testssl:latest
arm: quay.io/maistra/testssl:2.5
p: quay.io/maistra/testssl:0.0-ibm-p
z: quay.io/maistra/testssl:0.0-ibm-z

Expand Down
7 changes: 6 additions & 1 deletion pkg/tests/ossm/testssl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

"github.com/maistra/maistra-test-tool/pkg/app"
"github.com/maistra/maistra-test-tool/pkg/util/check/assert"
"github.com/maistra/maistra-test-tool/pkg/util/env"
"github.com/maistra/maistra-test-tool/pkg/util/oc"
"github.com/maistra/maistra-test-tool/pkg/util/pod"
"github.com/maistra/maistra-test-tool/pkg/util/retry"
Expand Down Expand Up @@ -69,11 +70,15 @@ spec:
oc.WaitDeploymentRolloutComplete(t, ns, "testssl")

t.LogStep("Check testssl.sh results")
command := "./testssl/testssl.sh -P -6 productpage:9080 || true"
if env.GetArch() == "arm" {
command = "/home/testssl/testssl.sh -P -6 istio-ingressgateway-istio-system.apps.rsarm.servicemesh.rhqeaws.com/productpage || true"
}
retry.UntilSuccessWithOptions(t, retry.Options().MaxAttempts(10), func(t TestHelper) {
oc.Exec(t,
pod.MatchingSelector("app=testssl", ns),
"testssl",
"./testssl/testssl.sh -P -6 productpage:9080 || true",
command,
assert.OutputContains(
"TLSv1.2",
"Received the TLSv1.2 needed in the testssl.sh results",
Expand Down

0 comments on commit bc51412

Please sign in to comment.