From fcda0fb8d95a88cd07f2e6c833375048f4e925e4 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 6 Sep 2019 10:08:35 +0100
Subject: [PATCH] Tweak detection of Bamboo

When exposed as an environment variable Bamboo's bamboo.resultsUrl
is mapped to bamboo_resultsUrl. This commit updates the build scan
user data script to look for the latter rather than the former.
---
 gradle/build-scan-user-data.gradle | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
index 7f2ac536210..a6517ca584a 100644
--- a/gradle/build-scan-user-data.gradle
+++ b/gradle/build-scan-user-data.gradle
@@ -44,13 +44,17 @@ void addGitMetadata() {
 
 void addCiMetadata() {
 	def ciBuild = 'CI BUILD'
-	if (System.getenv('bamboo.resultsUrl')) {
-		buildScan.link ciBuild, System.getenv('bamboo.resultsUrl')
+	if (isBamboo()) {
+		buildScan.link ciBuild, System.getenv('bamboo_resultsUrl')
 	}
 }
 
 boolean isCi() {
-	System.getenv('bamboo.resultsUrl')
+	isBamboo()
+}
+
+boolean isBamboo() {
+	System.getenv('bamboo_resultsUrl')
 }
 
 String execAndGetStdout(String... args) {