use commit SHA in github and gitlab job search

Author: daniel-cit

helpers/foundation-deployer/gitlab/gitlab.go

@@ -77,15 +77,37 @@ func triggerNewBuild(t testing.TB, ctx context.Context, owner, project, token st
 	return job.ID, nil
 }
 
-// GetLastJobStatus returns the status of the latest executed job
-func (g GL) GetLastJobStatus(t testing.TB, ctx context.Context, owner, project, token string) (string, int, error) {
+// GetLastJobStatusForSHA finds the latest job associated with a specific commit SHA
+func (g GL) GetLastJobStatusForSHA(t testing.TB, ctx context.Context, owner, project, token, sha string) (string, int, error) {
 	git, err := gitlab.NewClient(token)
 	if err != nil {
 		return "", 0, fmt.Errorf("failed to create client: %v", err)
 	}
 
+	projectPath := fmt.Sprintf("%s/%s", owner, project)
+
+	pipelineOpts := &gitlab.ListProjectPipelinesOptions{
+		ListOptions: gitlab.ListOptions{
+			PerPage: 1,
+			Page:    1,
+			OrderBy: "id",
+			Sort:    "desc",
+		},
+		SHA: &sha,
+	}
+
+	pipelines, _, err := git.Pipelines.ListProjectPipelines(projectPath, pipelineOpts, gitlab.WithContext(ctx))
+	if err != nil {
+		return "", 0, fmt.Errorf("error listing pipelines for SHA %s: %w", sha, err)
+	}
+
+	if len(pipelines) == 0 {
+		return "", 0, fmt.Errorf("no pipelines found for project '%s' at SHA '%s'", projectPath, sha)
+	}
+
+	latestPipelineID := pipelines[0].ID
 	includeRetried := true
-	opts := &gitlab.ListJobsOptions{
+	jobOpts := &gitlab.ListJobsOptions{
 		ListOptions: gitlab.ListOptions{
 			PerPage: 1,
 			Page:    1,
@@ -95,13 +117,13 @@ func (g GL) GetLastJobStatus(t testing.TB, ctx context.Context, owner, project,
 		IncludeRetried: &includeRetried,
 	}
 
-	jobs, _, err := git.Jobs.ListProjectJobs(fmt.Sprintf("%s/%s", owner, project), opts, gitlab.WithContext(ctx))
+	jobs, _, err := git.Jobs.ListPipelineJobs(projectPath, latestPipelineID, jobOpts, gitlab.WithContext(ctx))
 	if err != nil {
-		return "", 0, fmt.Errorf("error listing project jobs: %v", err)
+		return "", 0, fmt.Errorf("error listing jobs for pipeline %d: %w", latestPipelineID, err)
 	}
 
 	if len(jobs) == 0 {
-		return "", 0, fmt.Errorf("no jobs found for project: %s/%s", owner, project)
+		return "", 0, fmt.Errorf("no jobs found for pipeline %d", latestPipelineID)
 	}
 
 	return jobs[0].Status, jobs[0].ID, nil
@@ -175,7 +197,7 @@ func (g GL) GetFinalJobStatus(t testing.TB, ctx context.Context, owner, project,
 }
 
 // WaitBuildSuccess waits for the current job in a project to finish.
-func (g GL) WaitBuildSuccess(t testing.TB, owner, project, token, failureMsg string, maxBuildRetry, maxErrorRetries int, timeBetweenErrorRetries time.Duration) error {
+func (g GL) WaitBuildSuccess(t testing.TB, owner, project, token, commitSha, failureMsg string, maxBuildRetry, maxErrorRetries int, timeBetweenErrorRetries time.Duration) error {
 	var status string
 	var jobID int
 	var err error
@@ -184,7 +206,7 @@ func (g GL) WaitBuildSuccess(t testing.TB, owner, project, token, failureMsg str
 	// wait job creation
 	time.Sleep(30 * time.Second)
 
-	status, jobID, err = g.GetLastJobStatus(t, ctx, owner, project, token)
+	status, jobID, err = g.GetLastJobStatusForSHA(t, ctx, owner, project, token, commitSha)
 	if err != nil {
 		return err
 	}

helpers/foundation-deployer/stages/apply.go

@@ -61,21 +61,28 @@ func buildGitLabCICDImage(t testing.TB, s steps.Steps, tfvars GlobalTFVars, c Co
 		return err
 	}
 
+	commitSha, err := conf.GetCommitSha()
+	if err != nil {
+		return err
+	}
+
 	fmt.Println("")
 	fmt.Println("# Follow job execution in GitLab:")
 	fmt.Printf("# %s\n", fmt.Sprintf("https://gitlab.com/%s/%s/-/jobs", tfvars.GitRepos.Owner, *tfvars.GitRepos.CICDRunner))
 
 	failureMsg := fmt.Sprintf("CI/CD runner image job failed %s/%s repository.", tfvars.GitRepos.Owner, *tfvars.GitRepos.CICDRunner)
-	err = gl.WaitBuildSuccess(t, tfvars.GitRepos.Owner, *tfvars.GitRepos.CICDRunner, c.GitToken, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
+	err = gl.WaitBuildSuccess(t, tfvars.GitRepos.Owner, *tfvars.GitRepos.CICDRunner, c.GitToken, commitSha, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
 	if err != nil {
 		return err
 	}
+
 	projectsToAdd := make([]string, 5)
 	projectsToAdd[0] = tfvars.GitRepos.Bootstrap
 	projectsToAdd[1] = tfvars.GitRepos.Organization
 	projectsToAdd[2] = tfvars.GitRepos.Environments
 	projectsToAdd[3] = tfvars.GitRepos.Networks
 	projectsToAdd[4] = tfvars.GitRepos.Projects
+
 	return gl.AddProjectsToJobTokenScope(t, tfvars.GitRepos.Owner, *tfvars.GitRepos.CICDRunner, c.GitToken, projectsToAdd)
 }
 

helpers/foundation-deployer/stages/executor.go

@@ -81,5 +81,5 @@ func NewGitLabExecutor(owner, project, token string) *GitLabExecutor {
 }
 
 func (e *GitLabExecutor) WaitBuildSuccess(t testing.TB, commitSha, failureMsg string) error {
-	return e.executor.WaitBuildSuccess(t, e.owner, e.project, e.token, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
+	return e.executor.WaitBuildSuccess(t, e.owner, e.project, e.token, commitSha, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
 }