Skip to content

Commit

Permalink
Update 2.5 ARM testssl test (#657)
Browse files Browse the repository at this point in the history
* Update 2.5 ARM testssl test

Signed-off-by: yxun <yuanlin.yxu@gmail.com>

* Update testssl_test.go

* Update testssl_test with 2.5 tag image version 3.0.8

Signed-off-by: yxun <yuanlin.yxu@gmail.com>

* add the ARM group

---------

Signed-off-by: yxun <yuanlin.yxu@gmail.com>
Co-authored-by: Praneeth Bajjuri <pbajjuri@pbajjuri-thinkpadp1gen4i.rmtustx.csb>
  • Loading branch information
yxun and Praneeth Bajjuri authored Feb 6, 2024
1 parent db39455 commit 5d9194c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
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
10 changes: 8 additions & 2 deletions pkg/tests/ossm/testssl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ 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"
. "github.com/maistra/maistra-test-tool/pkg/util/test"
)

func TestSSL(t *testing.T) {
NewTest(t).Id("T27").Groups(Full, InterOp).Run(func(t TestHelper) {
NewTest(t).Id("T27").Groups(Full, InterOp, ARM).Run(func(t TestHelper) {
ns := "bookinfo"
t.Cleanup(func() {
oc.Patch(t, meshNamespace, "smcp", smcpName, "json", `[{"op": "remove", "path": "/spec/security/controlPlane/tls"}]`)
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 = "./testssl.sh -P -6 productpage:9080 || 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 Expand Up @@ -109,4 +114,5 @@ spec:
containers:
- name: testssl
image: {{ image "testssl" }}
command: ["tail", "-f", "/dev/null"]
`

0 comments on commit 5d9194c

Please sign in to comment.