fix(STONEINTG-1450): handle missing onboarding branch (#1773)

feat(STONEINTG-1450): check for onboarding branch

Added helper functions to handle missing onboarding
branches used by integration-service tests.

Signed-off-by: Josh Everett <jeverett@redhat.com>

Author: Josh-Everett

pkg/clients/github/git.go

@@ -69,3 +69,17 @@ func (g *Github) ExistsRef(repository, branchName string) (bool, error) {
 func (g *Github) UpdateGithubOrg(githubOrg string) {
 	g.organization = githubOrg
 }
+
+// EnsureBranchExists checks if a branch exists in the repository and creates one from
+// fallback branch if not.
+func (g *Github) EnsureBranchExists(repository, branchName, fallbackBranch string) error {
+	exists, err := g.ExistsRef(repository, branchName)
+	if err != nil {
+		return fmt.Errorf("error checking if branch '%s' exists: %w", branchName, err)
+	}
+	if exists {
+		return nil
+	}
+	// Branch doesn't exist, create it from fallback branch
+	return g.CreateRef(repository, fallbackBranch, "", branchName)
+}

pkg/clients/gitlab/git.go

@@ -425,6 +425,20 @@ func (gc *GitlabClient) ForkRepository(sourceOrgName, sourceName, targetOrgName,
 	return forkedProject, nil
 }
 
+// EnsureBranchExists checks if a branch exists in the repository and creates one from
+// fallback branch if not.
+func (gc *GitlabClient) EnsureBranchExists(projectID, branchName, fallbackBranch string) error {
+	exists, err := gc.ExistsBranch(projectID, branchName)
+	if err != nil {
+		return fmt.Errorf("error checking if branch '%s' exists: %w", branchName, err)
+	}
+	if exists {
+		return nil
+	}
+	// Branch doesn't exist, create it from fallback branch
+	return gc.CreateBranch(projectID, branchName, fallbackBranch)
+}
+
 func (gc *GitlabClient) GetAllProjects() ([]*gitlab.Project, error) {
 	listProjectsOptions := &gitlab.ListProjectsOptions{
 		Membership: gitlab.Ptr(true),

tests/integration-service/const.go

@@ -30,6 +30,7 @@ const (
 	multiRepoComponentGitRevision             = "79402df023e646c5ad108abc879ad1b28799cbc4"
 	gitlabComponentRepoName                   = "hacbs-test-project-integration"
 	componentDefaultBranch                    = "onboarding"
+	fallbackBranchName                        = "main"
 	componentRevision                         = "79402df023e646c5ad108abc879ad1b28799cbc4"
 	referenceDoesntExist                      = "Reference does not exist"
 	checkrunStatusCompleted                   = "completed"

tests/integration-service/gitlab-integration-reporting.go

@@ -73,6 +73,9 @@ var _ = framework.IntegrationServiceSuiteDescribe("Gitlab Status Reporting of In
 			gitlabToken = utils.GetEnv(constants.GITLAB_BOT_TOKEN_ENV, "")
 			gomega.Expect(gitlabToken).ShouldNot(gomega.BeEmpty(), fmt.Sprintf("'%s' env var is not set", constants.GITLAB_BOT_TOKEN_ENV))
 
+			err = f.AsKubeAdmin.CommonController.Gitlab.EnsureBranchExists(projectID, componentDefaultBranch, fallbackBranchName)
+			gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
+
 			err = f.AsKubeAdmin.CommonController.Gitlab.CreateGitlabNewBranch(projectID, componentBaseBranchName, componentRevision, componentDefaultBranch)
 			gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 

tests/integration-service/group-snapshots-tests.go

@@ -61,6 +61,12 @@ var _ = framework.IntegrationServiceSuiteDescribe("Creation of group snapshots f
 
 			applicationName = createApp(*f, testNamespace)
 
+			err = f.AsKubeAdmin.CommonController.Github.EnsureBranchExists(multiComponentRepoNameForGroupSnapshot, multiComponentDefaultBranch, fallbackBranchName)
+			gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
+
+			err = f.AsKubeAdmin.CommonController.Github.EnsureBranchExists(componentRepoNameForGroupIntegration, multiComponentDefaultBranch, fallbackBranchName)
+			gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
+
 			// The base branch or a ToBranch where all multi-component definitions will live
 			multiComponentBaseBranchName = fmt.Sprintf("love-triangle-%s", util.GenerateRandomString(6))
 			err = f.AsKubeAdmin.CommonController.Github.CreateRef(multiComponentRepoNameForGroupSnapshot, multiComponentDefaultBranch, multiComponentGitRevision, multiComponentBaseBranchName)
@@ -720,7 +726,6 @@ var _ = framework.IntegrationServiceSuiteDescribe("Creation of group snapshots f
 			})
 		})
 
-
 		ginkgo.When("IntegrationTestScenario reference to task as pipelinerun resolution", func() {
 			ginkgo.BeforeAll(func() {
 				invalidIntegrationTestScenario, err = f.AsKubeAdmin.IntegrationController.CreateIntegrationTestScenario("", applicationName, testNamespace, gitURL, revision, pathInRepoPass, "pipelinerun", []string{"application"})

tests/integration-service/integration.go

@@ -433,7 +433,10 @@ func createComponent(f framework.Framework, testNamespace, applicationName, comp
 	pacBranchName := constants.PaCPullRequestBranchPrefix + componentName
 	componentBaseBranchName := fmt.Sprintf("base-%s", util.GenerateRandomString(6))
 
-	err := f.AsKubeAdmin.CommonController.Github.CreateRef(componentRepoName, componentDefaultBranch, componentRevision, componentBaseBranchName)
+	err := f.AsKubeAdmin.CommonController.Github.EnsureBranchExists(componentRepoName, componentDefaultBranch, fallbackBranchName)
+	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
+
+	err = f.AsKubeAdmin.CommonController.Github.CreateRef(componentRepoName, componentDefaultBranch, componentRevision, componentBaseBranchName)
 	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 
 	// get the build pipeline bundle annotation