diff --git a/magefiles/magefile.go b/magefiles/magefile.go index 38ff2da4b..70d722b29 100644 --- a/magefiles/magefile.go +++ b/magefiles/magefile.go @@ -93,10 +93,16 @@ func (CI) parseJobSpec() error { func (ci CI) init() error { var err error - if jobType == "periodic" || strings.Contains(jobName, "rehearse") { + if (jobType == "periodic" && !strings.Contains(jobName, "release-service-catalog")) || strings.Contains(jobName, "rehearse") { return nil } + if strings.Contains(jobName, "release-service-catalog") && strings.Contains(jobName, "periodic") { + rctx.JobName = jobName + klog.Infof("setting rctx.JobName: %s", rctx.JobName) + // return nil + } + if err = ci.parseJobSpec(); err != nil { return err } @@ -135,7 +141,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 } @@ -149,6 +155,11 @@ func (ci CI) PrepareE2EBranch() error { } } else { if isPRPairingRequired("e2e-tests") { + if pr.RemoteName != "konflux-ci" { + if err := gitCheckoutRemoteBranch("konflux-ci", pr.BranchName); err != nil { + return err + } + } if err := gitCheckoutRemoteBranch(pr.RemoteName, pr.BranchName); err != nil { return err } @@ -359,6 +370,11 @@ func RunE2ETests() error { case "infra-deployments": return engine.MageEngine.RunRules(rctx, "tests", "infra-deployments") default: + klog.Infof("for debugging......rctx.JobName: %s", rctx.JobName) + 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") } @@ -824,8 +840,14 @@ func BootstrapCluster() error { func isPRPairingRequired(repoForPairing string) bool { var pullRequests []gh.PullRequest + var url string + + if repoForPairing == "infra-deployments" { + url = fmt.Sprintf("https://api.github.com/repos/redhat-appstudio/%s/pulls?per_page=100", repoForPairing) + } else { + url = fmt.Sprintf("https://api.github.com/repos/konflux-ci/%s/pulls?per_page=100", repoForPairing) + } - url := fmt.Sprintf("https://api.github.com/repos/redhat-appstudio/%s/pulls?per_page=100", repoForPairing) if err := sendHttpRequestAndParseResponse(url, "GET", &pullRequests); err != nil { klog.Infof("cannot determine %s Github branches for author %s: %v. will stick with the redhat-appstudio/%s main branch for running tests", repoForPairing, pr.RemoteName, err, repoForPairing) return false diff --git a/magefiles/rulesengine/repos/common.go b/magefiles/rulesengine/repos/common.go index 6adc6ab32..7ba6ad54f 100644 --- a/magefiles/rulesengine/repos/common.go +++ b/magefiles/rulesengine/repos/common.go @@ -179,8 +179,13 @@ func GitCheckoutRemoteBranch(remoteName, branchName string) error { func IsPRPairingRequired(repoForPairing string, remoteName string, branchName string) bool { var pullRequests []gh.PullRequest + var url string - url := fmt.Sprintf("https://api.github.com/repos/redhat-appstudio/%s/pulls?per_page=100", repoForPairing) + if repoForPairing == "infra-deployments" { + url = fmt.Sprintf("https://api.github.com/repos/redhat-appstudio/%s/pulls?per_page=100", repoForPairing) + } else { + url = fmt.Sprintf("https://api.github.com/repos/konflux-ci/%s/pulls?per_page=100", repoForPairing) + } if err := sendHttpRequestAndParseResponse(url, "GET", &pullRequests); err != nil { klog.Infof("cannot determine %s Github branches for author %s: %v. will stick with the redhat-appstudio/%s main branch for running tests", repoForPairing, remoteName, err, repoForPairing) return false