switch to explicit env var for labels

Author: rjernst

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy

@@ -11,9 +11,12 @@ package org.elasticsearch.gradle.internal.transport
 
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
+import org.elasticsearch.gradle.fixtures.WiremockFixture
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
 
+import java.nio.charset.StandardCharsets
+
 class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTest {
 
     def runGenerateAndValidateTask(String... additionalArgs) {
@@ -24,6 +27,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
         return gradleRunner(args.toArray())
     }
 
+    def runGenerateAndValidateWithLabels(String... labels) {
+        String labelsStr = String.join(System.lineSeparator(), List.of(labels));
+        return runGenerateAndValidateTask().withEnvironment(Map.of("PULL_REQUEST_LABELS", labelsStr));
+    }
+
     def runGenerateTask(String... additionalArgs) {
         List<String> args = new ArrayList<>()
         args.add(":myserver:generateTransportVersionDefinition")
@@ -402,4 +410,57 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
         assertReferableDefinition("new_tv", "9001000")
         assertUpperBound(releaseBranch, "new_tv,9001000")
     }
+
+    def "branch from pr targeting main"() {
+        given:
+        referencedTransportVersion("new_tv")
+
+        when:
+        def result = runGenerateAndValidateWithLabels("v9.2.0").build()
+
+        then:
+        assertGenerateAndValidateSuccess(result)
+        assertReferableDefinition("new_tv", "8124000")
+        assertUpperBound("9.2", "new_tv,8124000")
+    }
+
+    def "branch from pr for backport"() {
+        given:
+        referencedTransportVersion("new_tv")
+
+        when:
+        def result = runGenerateAndValidateWithLabels("v9.2.0", "v9.1.2").build()
+
+        then:
+        assertGenerateAndValidateSuccess(result)
+        assertReferableDefinition("new_tv", "8124000,8012002")
+        assertUpperBound("9.2", "new_tv,8124000")
+        assertUpperBound("9.1", "new_tv,8012002")
+    }
+
+    def "branch from pr with other labels"() {
+        given:
+        referencedTransportVersion("new_tv")
+
+        when:
+        def result = runGenerateAndValidateWithLabels(">test", "v9.2.0", ":Core/Infra/Core").build()
+
+        then:
+        assertGenerateAndValidateSuccess(result)
+        assertReferableDefinition("new_tv", "8124000")
+        assertUpperBound("9.2", "new_tv,8124000")
+    }
+
+    def "branch from pr default to main"() {
+        given:
+        referencedTransportVersion("new_tv")
+
+        when:
+        def result = runGenerateAndValidateWithLabels(">test", ":Core/Infra/Core").build()
+
+        then:
+        assertGenerateAndValidateSuccess(result)
+        assertReferableDefinition("new_tv", "8124000")
+        assertUpperBound("9.2", "new_tv,8124000")
+    }
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java

@@ -165,23 +165,13 @@ private Set<String> getTargetReleaseBranches() {
             // Look for env var indicating github PR link from CI.
             // Use github api to find current labels, filter down to version labels.
             // Map version labels to branches.
-            String prUrl = System.getenv("BUILDKITE_PULL_REQUEST");
-            if (prUrl == null) {
+            String prLabels = System.getenv("PULL_REQUEST_LABELS");
+            if (prLabels == null) {
                 throw new RuntimeException("When running outside CI, --branches must be specified");
             }
 
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            ExecResult result = execOperations.exec(spec -> {
-                spec.setCommandLine(List.of("gh", "pr", "view", prUrl, "--json", "labels", "--jq", ".labels[].name"));
-                spec.setErrorOutput(output);
-                spec.setStandardOutput(output);
-                spec.setIgnoreExitValue(true);
-            });
-            if (result.getExitValue() != 0) {
-                throw new RuntimeException("Failed to get labels from github API:\n" + output);
-            }
             Set<String> targetReleaseBranches = new HashSet<>();
-            for (String label : output.toString().split(System.lineSeparator())) {
+            for (String label : prLabels.split(System.lineSeparator())) {
                 if (label.startsWith("v") == false) {
                     continue;
                 }

build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

@@ -202,11 +202,13 @@ abstract class AbstractGradleFuncTest extends Specification {
 
     void execute(String command, File workingDir = testProjectDir.root) {
         def proc = command.execute(Collections.emptyList(), workingDir)
+        System.out.println(command)
         proc.waitFor()
         if (proc.exitValue()) {
             System.err.println("Error running command ${command}:")
             System.err.println("Syserr: " + proc.errorStream.text)
         }
+        System.out.println("Output: " + proc.inputStream.text)
     }
 
     File dir(String path) {