diff --git a/magefiles/magefile.go b/magefiles/magefile.go index 38ff2da4b..8e3a47099 100644 --- a/magefiles/magefile.go +++ b/magefiles/magefile.go @@ -97,6 +97,11 @@ func (ci CI) init() error { return nil } + if strings.Contains(jobName, "release-service-catalog") && strings.Contains(jobName, "periodic") { + rctx.JobName = jobName + // return nil + } + if err = ci.parseJobSpec(); err != nil { return err } @@ -135,7 +140,7 @@ func (ci CI) init() error { } func (ci CI) PrepareE2EBranch() error { - if jobType == "periodic" || strings.Contains(jobName, "rehearse") { + if (jobType == "periodic" && !strings.Contains(jobName, "release-service-catalog")) || strings.Contains(jobName, "rehearse") { return nil } @@ -359,6 +364,10 @@ func RunE2ETests() error { case "infra-deployments": return engine.MageEngine.RunRules(rctx, "tests", "infra-deployments") default: + if strings.Contains(rctx.JobName, "release-service-catalog") { + labelFilter := utils.GetEnv("E2E_TEST_SUITE_LABEL", "release-pipelines") + return runTests(labelFilter, "e2e-report.xml") + } labelFilter := utils.GetEnv("E2E_TEST_SUITE_LABEL", "!upgrade-create && !upgrade-verify && !upgrade-cleanup && !release-pipelines") return runTests(labelFilter, "e2e-report.xml") }