Pass CI branch parameter to build scan

Closes spring-projectsgh-19614
dreis2211 · Jan 12, 2020 · cf621dc · cf621dc
1 parent bda3ced
commit cf621dc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -210,6 +210,7 @@ jobs:
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/build-project.yml
       params:
+        BRANCH: ((branch))
         GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle-enterprise-cache-username))
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle-enterprise-cache-password))
     on_failure:
@@ -298,6 +299,7 @@ jobs:
       image: spring-boot-jdk11-ci-image
       file: git-repo/ci/tasks/build-project.yml
       params:
+        BRANCH: ((branch))
         GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle-enterprise-cache-username))
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle-enterprise-cache-password))
     on_failure:
@@ -334,6 +336,7 @@ jobs:
         image: spring-boot-jdk13-ci-image
         file: git-repo/ci/tasks/build-project.yml
         params:
+          BRANCH: ((branch))
           GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle-enterprise-cache-username))
           GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle-enterprise-cache-password))
       on_failure:

diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
@@ -9,6 +9,7 @@ caches:
 - path: gradle
 - path: embedmongo
 params:
+  BRANCH:
   CI: true
   GRADLE_ENTERPRISE_CACHE_USERNAME:
   GRADLE_ENTERPRISE_CACHE_PASSWORD:

diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
@@ -27,7 +27,7 @@ void tagCiOrLocal() {
 void addGitMetadata() {
 	gradleEnterprise.buildScan.background {
 		def gitCommitId = execAndGetStdout('git', 'rev-parse', '--short=8', '--verify', 'HEAD')
-		def gitBranchName = execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')
+		def gitBranchName = getBranch()
 		def gitStatus = execAndGetStdout('git', 'status', '--porcelain')
 
 		if(gitCommitId) {
@@ -50,6 +50,14 @@ boolean isCi() {
 	System.getenv('CI')
 }
 
+String getBranch() {
+	def branch = System.getenv('BRANCH')
+	if (branch != null && !branch.isEmpty()) {
+		return branch
+	}
+	return execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')
+}
+
 String execAndGetStdout(String... args) {
 	def stdout = new ByteArrayOutputStream()
 	exec {