Upgrade GraalVM version used in tests

jenkinsci · Dec 10, 2023 · c90947d · c90947d
1 parent db44a61
commit c90947d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/io/jenkins/plugins/projectenv/WithProjectEnvStepExecution.java b/src/main/java/io/jenkins/plugins/projectenv/WithProjectEnvStepExecution.java
@@ -108,7 +108,12 @@ private void execute() throws Exception {
     private String resolveProjectEnvCliExecutableFromPath(AgentInfo agentInfo) throws Exception {
         String[] commands = getExecutablePathResolveCommand(agentInfo);
 
-        return StringUtils.trimToNull(ProcHelper.executeAndGetStdOut(getContext(), commands));
+        String stdOut = StringUtils.trimToNull(ProcHelper.executeAndGetStdOut(getContext(), commands));
+        if (stdOut == null) {
+            return null;
+        }
+
+        return stdOut.split(agentInfo.getLineSeparator())[0];
     }
 
     private String[] getExecutablePathResolveCommand(AgentInfo agentInfo) {

diff --git a/src/main/java/io/jenkins/plugins/projectenv/agent/AgentInfo.java b/src/main/java/io/jenkins/plugins/projectenv/agent/AgentInfo.java
@@ -9,5 +9,6 @@
 public interface AgentInfo extends Serializable {
 
     OperatingSystem getOperatingSystem();
+    String  getLineSeparator();
 
 }
diff --git a/src/main/java/io/jenkins/plugins/projectenv/agent/AgentInfoCallable.java b/src/main/java/io/jenkins/plugins/projectenv/agent/AgentInfoCallable.java
@@ -9,7 +9,9 @@ public class AgentInfoCallable extends MasterToSlaveCallable<AgentInfo, Exceptio
     public AgentInfo call() throws Exception {
         OperatingSystem operatingSystem = getOperatingSystem();
 
-        return ImmutableAgentInfo.builder().operatingSystem(operatingSystem).build();
+        return ImmutableAgentInfo.builder()
+                .lineSeparator(System.lineSeparator())
+                .operatingSystem(operatingSystem).build();
     }
 
     private OperatingSystem getOperatingSystem() {

diff --git a/src/test/java/io/jenkins/plugins/projectenv/WithProjectEnvStepTest.java b/src/test/java/io/jenkins/plugins/projectenv/WithProjectEnvStepTest.java
@@ -57,8 +57,8 @@ public void testStepExecution() throws Exception {
         assertThat(run.getLog())
                 // assert that the JDK (including native-image)  has been installed
                 .contains("installing jdk...")
-                .contains("openjdk version \"17.0.1\" 2021-10-19")
-                .contains("GraalVM 21.3.0 Java 17 CE (Java Version 17.0.1+12-jvmci-21.3-b05)")
+                .contains("openjdk version \"17.0.9\" 2023-10-17")
+                .contains("native-image 17.0.9 2023-10-17")
                 // assert that Maven has been installed
                 .contains("installing maven...")
                 .contains("Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537)")

diff --git a/src/test/resources/io/jenkins/plugins/projectenv/project-env.toml b/src/test/resources/io/jenkins/plugins/projectenv/project-env.toml
@@ -2,7 +2,7 @@ tools_directory = ".tools"
 
 [jdk]
 distribution = "GraalVM CE 17"
-distribution_version = "21.3.0"
+distribution_version = "23.0.2"
 post_extraction_commands = [
     "gu install native-image"
 ]