Skip to content

Commit

Permalink
[OSSM-6824] Update testssl image to use openssl3 (#717)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkralik3 authored Jul 24, 2024
1 parent a7eebda commit 4886de5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
9 changes: 5 additions & 4 deletions images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ fortio:
p: quay.io/maistra/fortio.test:0.0-ibm-p
z: quay.io/maistra/fortio:0.0-ibm-z

# Dockerfile: https://gitlab.cee.redhat.com/-/snippets/8438
testssl:
x86: quay.io/maistra/testssl:latest
arm64: quay.io/maistra/testssl:arm64
p: quay.io/maistra/testssl:0.0-ibm-p
z: quay.io/maistra/testssl:0.0-ibm-z
x86: quay.io/maistra/testssl:openssl3
arm64: quay.io/maistra/testssl:openssl3
p: quay.io/maistra/testssl:openssl3
z: quay.io/maistra/testssl:openssl3

helloworld:
x86: quay.io/jewertow/examples-helloworld-v1
Expand Down
13 changes: 5 additions & 8 deletions pkg/tests/ossm/testssl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ 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/ns"
"github.com/maistra/maistra-test-tool/pkg/util/oc"
"github.com/maistra/maistra-test-tool/pkg/util/pod"
Expand Down Expand Up @@ -70,10 +69,8 @@ spec:
oc.WaitDeploymentRolloutComplete(t, ns.Bookinfo, "testssl")

t.LogStep("Check testssl.sh results")
command := "./testssl/testssl.sh -P -6 productpage:9080 || true"
if env.GetArch() == "arm64" {
command = "./testssl.sh -P -6 productpage:9080 || true"
}
command := "testssl.sh -P -6 --ssl-native productpage:9080 || true"

retry.UntilSuccessWithOptions(t, retry.Options().MaxAttempts(10), func(t TestHelper) {
oc.Exec(t,
pod.MatchingSelector("app=testssl", ns.Bookinfo),
Expand All @@ -88,9 +85,9 @@ spec:
"Results received the correct SHA256",
"Results not include: ECDHE-RSA-AES128-GCM-SHA256"),
assert.OutputContains(
"P-256",
"Results included: P-256",
"Results not include: P-256"))
"prime256v1",
"Results included: prime256v1",
"Results not include:prime256v1"))
})
})
}
Expand Down

0 comments on commit 4886de5

Please sign in to comment.