Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing the 2.3 from the test cases #725

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/tests/ossm/deploy_on_infra_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ func TestDeployOnInfraNodes(t *testing.T) {
test.NewTest(t).Id("T40").Groups(test.Full, test.Disconnected, test.ARM).Run(func(t test.TestHelper) {
t.Log("This test verifies that the OSSM operator and Istio components can be configured to run on infrastructure nodes")

if env.GetSMCPVersion().LessThan(version.SMCP_2_3) {
t.Skip("Deploy On Infra node is available in SMCP versions v2.3+")
}
if env.IsRosa() {
t.Skip("Skipping test on ROSA due to lack of permissions")
}
Expand Down
6 changes: 0 additions & 6 deletions pkg/tests/ossm/smcp_secret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,15 @@ import (
"strings"
"testing"

"github.com/maistra/maistra-test-tool/pkg/util/env"
"github.com/maistra/maistra-test-tool/pkg/util/shell"
. "github.com/maistra/maistra-test-tool/pkg/util/test"
"github.com/maistra/maistra-test-tool/pkg/util/version"
)

func TestSMCPSecret(t *testing.T) {
NewTest(t).Id("T52").Groups(Full, Disconnected, ARM).Run(func(t TestHelper) {
// Created a subtest because we need to add more test related to Addons in the future.
t.NewSubTest("secret_validation").Run(func(t TestHelper) {

if env.GetSMCPVersion().LessThan(version.SMCP_2_4) {
t.Skip("Secret is not valid in SMCP versions v2.3")
}

DeployControlPlane(t)

output := shell.Execute(t, fmt.Sprintf(`oc get secret -n %s htpasswd -o json | jq .data.auth | tr -d \" | base64 -d | sed 's/}.*/}REDACTED\n/'`, meshNamespace))
Expand Down
8 changes: 2 additions & 6 deletions pkg/tests/tasks/security/authorization/ext_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ import (

func TestEnvoyExtAuthzHttpExtensionProvider(t *testing.T) {
test.NewTest(t).Id("T37").Groups(test.Full, test.InterOp, test.ARM).Run(func(t test.TestHelper) {
if env.GetSMCPVersion().LessThan(version.SMCP_2_3) {
t.Skip("extensionProviders.envoyExtAuthzHttp was added in v2.3")
}

t.Log("This test validates authorization policies with a JWT Token")

ns := "foo"
Expand Down Expand Up @@ -137,9 +135,7 @@ spec:

func TestEnvoyExtAuthzGrpcExtensionProvider(t *testing.T) {
test.NewTest(t).Id("T42").Groups(test.Full, test.InterOp, test.ARM).Run(func(t test.TestHelper) {
if env.GetSMCPVersion().LessThan(version.SMCP_2_3) {
t.Skip("extensionProviders.envoyExtAuthzGrpc is not supported in versions below v2.3")
}

t.Log("This test validates authorization policies with a JWT Token")

ns := "foo"
Expand Down