[mq] working branch - merge 11bbfaa on top of main at 229781c

dd-mergequeue[bot] · web-flow · commit 188e5e03f0d7 · 2025-07-30T08:38:19.000Z
{"baseBranch":"main","baseCommit":"229781cf96178ca0f70ea6cc06bb754bad509635","createdAt":"2025-07-30T08:22:16.909173Z","headSha":"11bbfaa677a1c852bbe495d9156da4ab49e032a2","id":"87692311-10cc-4b8b-bdc2-e52d1173a60b","priority":"200","pullRequestNumber":"3816","queuedAt":"2025-07-30T08:38:09.556085Z","status":"STATUS_QUEUED"}
diff --git a/internal/civisibility/constants/git.go b/internal/civisibility/constants/git.go
@@ -77,6 +77,9 @@ const (
 	// GitPrBaseCommit indicates the GIT PR base commit hash.
 	GitPrBaseCommit = "git.pull_request.base_branch_sha"
 
+	// GitPrBaseHeadCommit indicates the GIT PR base branch head commit hash.
+	GitPrBaseHeadCommit = "git.pull_request.base_branch_head_sha"
+
 	// GitPrBaseBranch indicates the GIT PR base branch name.
 	GitPrBaseBranch = "git.pull_request.base_branch"
 
diff --git a/internal/civisibility/utils/ci_providers.go b/internal/civisibility/utils/ci_providers.go
@@ -464,7 +464,7 @@ func extractGithubActions() map[string]string {
 			eventDecoder := json.NewDecoder(eventFile)
 			if eventDecoder.Decode(&eventJSON) == nil {
 				tags[constants.GitHeadCommit] = eventJSON.PullRequest.Head.Sha
-				tags[constants.GitPrBaseCommit] = eventJSON.PullRequest.Base.Sha
+				tags[constants.GitPrBaseHeadCommit] = eventJSON.PullRequest.Base.Sha
 				tags[constants.GitPrBaseBranch] = eventJSON.PullRequest.Base.Ref
 				tags[constants.PrNumber] = fmt.Sprintf("%d", eventJSON.Number)
 			}
@@ -516,7 +516,8 @@ func extractGitlab() map[string]string {
 	}
 
 	tags[constants.GitHeadCommit] = os.Getenv("CI_MERGE_REQUEST_SOURCE_BRANCH_SHA")
-	tags[constants.GitPrBaseCommit] = os.Getenv("CI_MERGE_REQUEST_TARGET_BRANCH_SHA")
+	tags[constants.GitPrBaseHeadCommit] = os.Getenv("CI_MERGE_REQUEST_TARGET_BRANCH_SHA")
+	tags[constants.GitPrBaseCommit] = os.Getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA")
 	tags[constants.GitPrBaseBranch] = os.Getenv("CI_MERGE_REQUEST_TARGET_BRANCH_NAME")
 	tags[constants.PrNumber] = os.Getenv("CI_MERGE_REQUEST_IID")
 
diff --git a/internal/civisibility/utils/ci_providers_test.go b/internal/civisibility/utils/ci_providers_test.go
@@ -164,7 +164,7 @@ func TestGitHubEventFile(t *testing.T) {
 		expectedPrNumber := "1"
 
 		checkValue(tags, constants.GitHeadCommit, expectedHeadCommit)
-		checkValue(tags, constants.GitPrBaseCommit, expectedBaseCommit)
+		checkValue(tags, constants.GitPrBaseHeadCommit, expectedBaseCommit)
 		checkValue(tags, constants.GitPrBaseBranch, expectedBaseRef)
 		checkValue(tags, constants.PrNumber, expectedPrNumber)
 	})
