Update build scan configuration to support Buildkite (#93715)

Author: mark-vieira

build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle

@@ -10,13 +10,10 @@ import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.OS
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.gradle.initialization.BuildRequestMetaData
-import org.elasticsearch.gradle.internal.test.rerun.TestRerunPlugin
-import java.util.concurrent.TimeUnit
-
-long startTime = project.gradle.services.get(BuildRequestMetaData).getStartTime()
 
 buildScan {
   URL jenkinsUrl = System.getenv('JENKINS_URL') ? new URL(System.getenv('JENKINS_URL')) : null
+  String buildKiteUrl = System.getenv('BUILDKITE_BUILD_URL') ? System.getenv('BUILDKITE_BUILD_URL') : null
 
   // Automatically publish scans from Elasticsearch CI
   if (jenkinsUrl?.host?.endsWith('elastic.co') || jenkinsUrl?.host?.endsWith('elastic.dev')) {
@@ -25,12 +22,6 @@ buildScan {
   }
 
   background {
-    String buildNumber = System.getenv('BUILD_NUMBER')
-    String buildUrl = System.getenv('BUILD_URL')
-    String jobName = System.getenv('JOB_NAME')
-    String nodeName = System.getenv('NODE_NAME')
-    String jobBranch = System.getenv('ghprbTargetBranch') ?: System.getenv('JOB_BRANCH')
-
     tag OS.current().name()
     tag Architecture.current().name()
 
@@ -39,23 +30,25 @@ buildScan {
       tag 'FIPS'
     }
 
-    // Link to Jenkins worker logs and system metrics
-    if (nodeName) {
-      link 'System logs', "https://ci-stats.elastic.co/app/infra#/logs?" +
-        "&logFilter=(expression:'host.name:${nodeName}',kind:kuery)"
-      buildFinished {
-        link 'System metrics', "https://ci-stats.elastic.co/app/metrics/detail/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)}))"
-      }
-    }
-
     // Jenkins-specific build scan metadata
     if (jenkinsUrl) {
       // Disable async upload in CI to ensure scan upload completes before CI agent is terminated
       uploadInBackground = false
 
+      String buildNumber = System.getenv('BUILD_NUMBER')
+      String buildUrl = System.getenv('BUILD_URL')
+      String jobName = System.getenv('JOB_NAME')
+      String nodeName = System.getenv('NODE_NAME')
+      String jobBranch = System.getenv('ghprbTargetBranch') ?: System.getenv('JOB_BRANCH')
+
+      // Link to Jenkins worker logs and system metrics
+      if (nodeName) {
+        link 'System logs', "https://ci-stats.elastic.co/app/infra#/logs?&logFilter=(expression:'host.name:${nodeName}',kind:kuery)"
+        buildFinished {
+          link 'System metrics', "https://ci-stats.elastic.co/app/metrics/detail/host/${nodeName}"
+        }
+      }
+
       // 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('/')
@@ -98,26 +91,45 @@ buildScan {
         value 'Git Commit ID', BuildParams.gitRevision
         link 'Source', "https://github.com/elastic/elasticsearch/tree/${BuildParams.gitRevision}"
       }
+    } else if (buildKiteUrl) { //Buildkite-specific build scan metadata
+      // Disable async upload in CI to ensure scan upload completes before CI agent is terminated
+      uploadInBackground = false
+
+      def branch = System.getenv('BUILDKITE_BRANCH')
+      def repoMatcher = System.getenv('BUILDKITE_REPO') =~ /(https:\/\/github\.com\/|git@github\.com:)(\S+)\.git/
+      def repository = repoMatcher.matches() ? repoMatcher.group(2) : "<unknown>"
+      tag 'CI'
+      link 'CI Build', buildKiteUrl
+      value 'Job Number', System.getenv('BUILDKITE_BUILD_NUMBER')
+
+
+      // Add SCM information
+      def prId = System.getenv('BUILDKITE_PULL_REQUEST')
+      if (prId) {
+        def prBaseUrl = (System.getenv('BUILDKITE_PULL_REQUEST_REPO') - ".git")
+        value 'Git Commit ID', System.getenv('BUILDKITE_COMMIT')
+        tag "pr/${prId}"
+        tag 'pull-request'
+        link 'Source', "${prBaseUrl}/tree/${System.getenv('BUILDKITE_COMMIT')}"
+        link 'Pull Request', "https://github.com/${repository}/pull/${prId}"
+      } else {
+        value 'Git Commit ID', BuildParams.gitRevision
+        link 'Source', "https://github.com/${repository}/tree/${BuildParams.gitRevision}"
+        tag branch
+      }
+
+      buildScanPublished { scan ->
+        // Attach build scan link as build metadata
+        // See: https://buildkite.com/docs/pipelines/build-meta-data
+        ['buildkite-agent', 'meta-data', 'set', "build-scan-${System.getenv('BUILDKITE_JOB_ID')}", "${scan.buildScanUri}"].execute()
+
+        // Add a build annotation
+        // See: https://buildkite.com/docs/agent/v3/cli-annotate
+        def body = """<div class="mb3"><span class="p1 border rounded">${System.getenv('BUILDKITE_LABEL')}</span> :gradle: build ran: <a href="${scan.buildScanUri}"><code>gradle ${gradle.startParameter.taskNames.join(' ')}</code></a></div>"""
+        ['buildkite-agent', 'annotate', '--context', 'gradle-build-scans', '--append', '--style', 'info', body].execute()
+      }
     } else {
       tag 'LOCAL'
     }
   }
 }
-
-subprojects {
-  project.getPlugins().withType(TestRerunPlugin) {
-    tasks.withType(Test).configureEach(new Action<Test>() {
-      @Override
-      void execute(Test test) {
-        test.doLast(new Action<Test>() {
-          @Override
-          void execute(Test t) {
-            if(t.rerun.didRerun.get() == true) {
-              buildScan.tag 'unexpected-test-jvm-exit'
-            }
-          }
-        })
-      }
-    })
-  }
-}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java

@@ -112,7 +112,7 @@ public void apply(Project project) {
             params.setGitOrigin(gitInfo.getOrigin());
             params.setBuildDate(ZonedDateTime.now(ZoneOffset.UTC));
             params.setTestSeed(getTestSeed());
-            params.setIsCi(System.getenv("JENKINS_URL") != null);
+            params.setIsCi(System.getenv("JENKINS_URL") != null || System.getenv("BUILDKITE_BUILD_URL") != null);
             params.setDefaultParallel(ParallelDetector.findDefaultParallel(project));
             params.setInFipsJvm(Util.getBooleanProperty("tests.fips.enabled", false));
             params.setIsSnapshotBuild(Util.getBooleanProperty("build.snapshot", true));