WIP adding merge base to teamcity pr job

brianseeders · brianseeders · commit 7f1447bd1028 · 2021-01-11T11:51:45.000-05:00
diff --git a/.ci/teamcity/setup_ci_stats.js b/.ci/teamcity/setup_ci_stats.js
@@ -24,7 +24,7 @@ const ciStats = require('./ci_stats');
       branch: process.env.GIT_BRANCH.replace(/^(refs\/heads\/|origin\/)/, ''),
       commit: process.env.GIT_COMMIT,
       targetBranch: process.env.GITHUB_PR_TARGET_BRANCH || null,
-      mergeBase: null, // TODO
+      mergeBase: process.env.GITHUB_PR_MERGE_BASE || null,
     });
   } catch (ex) {
     console.error(ex);
diff --git a/.ci/teamcity/setup_env.sh b/.ci/teamcity/setup_env.sh
@@ -40,6 +40,8 @@ if is_pr; then
   tc_set_env ghprbGhRepository "elastic/kibana" # TODO?
   tc_set_env ghprbActualCommit "$GITHUB_PR_TRIGGERED_SHA"
   tc_set_env BUILD_URL "$TEAMCITY_BUILD_URL"
+
+  set_git_merge_base
 else
   tc_set_env ELASTIC_APM_ACTIVE "${CI_REPORTING_ENABLED-}"
   tc_set_env CHECKS_REPORTER_ACTIVE false
diff --git a/.ci/teamcity/util.sh b/.ci/teamcity/util.sh
@@ -79,3 +79,10 @@ tc_retry() {
   }
   tc_end_block "Retryable Step - Attempt #1"
 }
+
+set_git_merge_base() {
+  if [[ "${GITHUB_PR_TARGET_BRANCH-}" ]]; then
+    git fetch origin "$GITHUB_PR_TARGET_BRANCH"
+    tc_set_env GITHUB_PR_MERGE_BASE "$(git merge-base HEAD FETCH_HEAD)"
+  fi
+}

Original file line number	Diff line number	Diff line change
`@@ -79,3 +79,10 @@ tc_retry() {`
`79`	`79`	`}`
`80`	`80`	`tc_end_block "Retryable Step - Attempt #1"`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+set_git_merge_base() {`
	`84`	`+ if [[ "${GITHUB_PR_TARGET_BRANCH-}" ]]; then`
	`85`	`+ git fetch origin "$GITHUB_PR_TARGET_BRANCH"`
	`86`	`+ tc_set_env GITHUB_PR_MERGE_BASE "$(git merge-base HEAD FETCH_HEAD)"`
	`87`	`+ fi`
	`88`	`+}`