Revert "Use updated environment variable for branch build scan metadata"

This reverts commit e3f9144

Author: mark-vieira

gradle/build-scan.gradle

@@ -1,6 +1,3 @@
-import org.elasticsearch.gradle.Architecture
-import org.elasticsearch.gradle.OS
-import org.elasticsearch.gradle.info.BuildParams
 import org.gradle.initialization.BuildRequestMetaData
 
 import java.util.concurrent.TimeUnit
@@ -14,14 +11,6 @@ buildScan {
   String jobName = System.getenv('JOB_NAME')
   String nodeName = System.getenv('NODE_NAME')
 
-  tag OS.current().name()
-  tag Architecture.current().name()
-
-  // Tag if this build is run in FIPS mode
-  if (BuildParams.inFipsJvm) {
-    tag 'FIPS'
-  }
-
   // Automatically publish scans from Elasticsearch CI
   if (jenkinsUrl?.host?.endsWith('elastic.co')) {
     publishAlways()
@@ -33,7 +22,7 @@ buildScan {
     link 'System logs', "https://infra-stats.elastic.co/app/infra#/logs?" +
       "&logFilter=(expression:'host.name:${nodeName}',kind:kuery)"
     buildFinished {
-      link 'System metrics', "https://infra-stats.elastic.co/app/metrics/detail/host/" +
+      link 'System metrics', "https://infra-stats.elastic.co/app/infra#/metrics/host/" +
         "${nodeName}?_g=()&metricTime=(autoReload:!f,refreshInterval:5000," +
         "time:(from:${startTime - TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES)},interval:%3E%3D1m," +
         "to:${System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES)}))"
@@ -42,9 +31,6 @@ buildScan {
 
   // Jenkins-specific build scan metadata
   if (jenkinsUrl) {
-    // Disable async upload in CI to ensure scan upload completes before CI agent is terminated
-    uploadInBackground = false
-
     // Parse job name in the case of matrix builds
     // Matrix job names come in the form of "base-job-name/matrix_param1=value1,matrix_param2=value2"
     def splitJobName = jobName.split('/')
@@ -62,12 +48,10 @@ buildScan {
       value 'Job Name', jobName
     }
 
-      tag 'CI'
-      link 'CI Build', buildUrl
-      link 'GCP Upload', "https://console.cloud.google.com/storage/browser/_details/elasticsearch-ci-artifacts/jobs/${URLEncoder.encode(jobName, "UTF-8")}/build/${buildNumber}.tar.bz2"
-      value 'Job Number', buildNumber
-      tag System.getenv('JOB_BRANCH')
-      value 'Git Branch', System.getenv('JOB_BRANCH')
+    tag 'CI'
+    link 'CI Build', buildUrl
+    link 'GCP Upload', "https://console.cloud.google.com/storage/browser/_details/elasticsearch-ci-artifacts/jobs/${URLEncoder.encode(jobName, "UTF-8")}/build/${buildNumber}.tar.bz2"
+    value 'Job Number', buildNumber
 
     System.getenv().getOrDefault('NODE_LABELS', '').split(' ').each {
       value 'Jenkins Worker Label', it
@@ -77,13 +61,26 @@ buildScan {
     def isPrBuild = System.getenv('ROOT_BUILD_CAUSE_GHPRBCAUSE') != null
     if (isPrBuild) {
       value 'Git Commit ID', System.getenv('ghprbActualCommit')
+      value 'Git Branch', System.getenv('ghprbTargetBranch')
+      tag System.getenv('ghprbTargetBranch')
       tag "pr/${System.getenv('ghprbPullId')}"
       tag 'pull-request'
       link 'Source', "https://github.com/elastic/elasticsearch/tree/${System.getenv('ghprbActualCommit')}"
       link 'Pull Request', System.getenv('ghprbPullLink')
     } else {
-      value 'Git Commit ID', BuildParams.gitRevision
-      link 'Source', "https://github.com/elastic/elasticsearch/tree/${BuildParams.gitRevision}"
+      if (System.getenv('GIT_BRANCH')) {
+        def branch = System.getenv('GIT_BRANCH').split('/').last()
+        value 'Git Branch', branch
+        tag branch
+      }
+      if (System.getenv('GIT_COMMIT')) {
+        value 'Git Commit ID', System.getenv('GIT_COMMIT')
+        link 'Source', "https://github.com/elastic/elasticsearch/tree/${System.getenv('GIT_COMMIT')}"
+        background {
+          def changes = "git diff --name-only ${System.getenv('GIT_PREVIOUS_COMMIT')}..${System.getenv('GIT_COMMIT')}".execute().text.trim()
+          value 'Git Changes', changes
+        }
+      }
     }
   } else {
     tag 'LOCAL'