Update develocity-injection init script to v1.1 (#507)

* Update develocity-injection init script to v1.1 Updates the develocity-injection init script to the latest reference script content from https://github.com/gradle/develocity-ci-injection. * Fix test assertion according to latest init script * Fix test assertion according to latest init script --------- Co-authored-by: Alexis Tual <[email protected]>
jenkinsci · Dec 12, 2024 · abb4c3f · abb4c3f
1 parent cb3c34b
commit abb4c3f
Show file tree

Hide file tree

Showing 3 changed files with 135 additions and 91 deletions.
diff --git a/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java b/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java
@@ -27,6 +27,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
+import static org.jenkinsci.test.acceptance.Matchers.containsRegexp;
 import static org.jenkinsci.test.acceptance.Matchers.containsString;
 
 public class GradleInjectionTest extends AbstractAcceptanceTest {
@@ -352,7 +353,7 @@ private void assertBuildScanPublished(Build build, boolean requireAppliedViaInit
         String output = build.getConsole();
 
         Matcher<String> appliedViaInitScriptMatcher =
-            containsString("Applying com.gradle.enterprise.gradleplugin.GradleEnterprisePlugin via init script");
+            containsRegexp("Applying com.gradle.enterprise.gradleplugin.GradleEnterprisePlugin with version (.*) via init script");
         assertThat(output, requireAppliedViaInitScript ? appliedViaInitScriptMatcher : not(appliedViaInitScriptMatcher));
         assertRequiredLogLines(output, requiredLogsLines);
         assertThat(output, containsString("Publishing build scan..." + System.lineSeparator() + mockGeServer.publicBuildScanId()));