Skip to content

Commit

Permalink
STONEBLD-2371 Multi platform controller tests
Browse files Browse the repository at this point in the history
Add in-repo tests for multi platform controller
  • Loading branch information
stuartwdouglas committed Apr 23, 2024
1 parent 5fc0d33 commit 302799b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions magefiles/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@ func setRequiredEnvVars() error {
envVarPrefix = "MULTI_PLATFORM_CONTROLLER"
imageTagSuffix = "multi-platform-controller"
testSuiteLabel = "multi-platform"
im := strings.Split(os.Getenv("OTP_SERVER_IMAGE"), "@")
os.Setenv("MULTI_PLATFORM_CONTROLLER_OTP_IMAGE_REPO", im[0])
os.Setenv("MULTI_PLATFORM_CONTROLLER_OTP_IMAGE_TAG", im[1])
requiresMultiPlatformTests = true
}

Expand All @@ -503,12 +506,12 @@ func setRequiredEnvVars() error {
requiresSprayProxyRegistering = true
os.Setenv("INFRA_DEPLOYMENTS_ORG", pr.RemoteName)
os.Setenv("INFRA_DEPLOYMENTS_BRANCH", pr.BranchName)
/* Disabling "build tests" temporary due:
/* Disabling "build tests" and multi-platform tests temporary due:
TODO: Enable when issues are done:
https://issues.redhat.com/browse/RHTAPBUGS-992, https://issues.redhat.com/browse/RHTAPBUGS-991, https://issues.redhat.com/browse/RHTAPBUGS-989,
https://issues.redhat.com/browse/RHTAPBUGS-978,https://issues.redhat.com/browse/RHTAPBUGS-956
*/
os.Setenv("E2E_TEST_SUITE_LABEL", "e2e-demo,rhtap-demo,spi-suite,remote-secret,integration-service,ec,byoc,build-templates,multi-platform")
os.Setenv("E2E_TEST_SUITE_LABEL", "e2e-demo,rhtap-demo,spi-suite,remote-secret,integration-service,ec,byoc,build-templates")
} else if strings.Contains(jobName, "release-service-catalog") { // release-service-catalog jobs (pull, rehearsal)
envVarPrefix := "RELEASE_SERVICE"
os.Setenv("E2E_TEST_SUITE_LABEL", "release-pipelines")
Expand Down
2 changes: 1 addition & 1 deletion tests/build/multi-platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var (
interval = 10 * time.Second
)

var _ = framework.MultiPlatformBuildSuiteDescribe("Multi Platform Controller E2E tests", Pending, Label("multi-platform"), func() {
var _ = framework.MultiPlatformBuildSuiteDescribe("Multi Platform Controller E2E tests", Label("multi-platform"), func() {
var f *framework.Framework
AfterEach(framework.ReportFailure(&f))
var err error
Expand Down

0 comments on commit 302799b

Please sign in to comment.