Skip to content

Commit

Permalink
refactor(RHTAPREL-852): don't run fbc tests in catalog PRs (konflux-c…
Browse files Browse the repository at this point in the history
…i#1053)

The fbc tests go against the stage cluster so they shouldn't be run on
paired catalog PRs.

Signed-off-by: Johnny Bieren <[email protected]>
  • Loading branch information
johnbieren authored and siddardh committed Mar 4, 2024
1 parent 8129a3a commit 6cfc7fb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion magefiles/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ func setRequiredEnvVars() error {
os.Setenv("E2E_TEST_SUITE_LABEL", "e2e-demo,rhtap-demo,spi-suite,remote-secret,integration-service,ec,byoc,build-templates,multi-platform")
} 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")
// "rehearse" jobs metadata are not relevant for testing
if !strings.Contains(jobName, "rehearse") {
os.Setenv(fmt.Sprintf("%s_CATALOG_URL", envVarPrefix), fmt.Sprintf("https://github.com/%s/%s", pr.RemoteName, pr.RepoName))
Expand All @@ -509,6 +510,7 @@ func setRequiredEnvVars() error {
}
os.Setenv(fmt.Sprintf("%s_PR_OWNER", envVarPrefix), pr.RemoteName)
os.Setenv(fmt.Sprintf("%s_PR_SHA", envVarPrefix), pairedSha)
os.Setenv("E2E_TEST_SUITE_LABEL", "release-pipelines && !fbc-tests")
}
}
if os.Getenv("REL_IMAGE_CONTROLLER_QUAY_ORG") != "" {
Expand All @@ -517,7 +519,6 @@ func setRequiredEnvVars() error {
if os.Getenv("REL_IMAGE_CONTROLLER_QUAY_TOKEN") != "" {
os.Setenv("IMAGE_CONTROLLER_QUAY_TOKEN", os.Getenv("REL_IMAGE_CONTROLLER_QUAY_TOKEN"))
}
os.Setenv("E2E_TEST_SUITE_LABEL", "release-pipelines")
} else { // openshift/release rehearse job for e2e-tests/infra-deployments repos
requiresMultiPlatformTests = true
requiresSprayProxyRegistering = true
Expand Down

0 comments on commit 6cfc7fb

Please sign in to comment.