From d817b591e53cb4c7d9d78ae32a88368bd22dc584 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Fri, 6 Sep 2019 19:16:59 +0200
Subject: [PATCH] Revert "Tweak detection of Bamboo (#23597)"

This reverts commit 35567678ef5163b538c0280be8ccf99339bcba2e, reversing
changes made to 807e1d336709447e6878f445c323420d1160c8c2.
---
 gradle/build-scan-user-data.gradle | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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