From d892ed5aad885dc3a9c9383d0eb492caa5f14433 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 28 Oct 2025 11:38:41 +0000 Subject: [PATCH 1/2] test: Test the DockerManagerIVT against Java 17 Signed-off-by: Jade Carino --- .../galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java index a693346..0ee7646 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java @@ -30,7 +30,7 @@ public class DockerLocalJava11Ubuntu extends AbstractDockerUbuntuLocal { @LinuxImage(imageTag = "PRIMARY") public ILinuxImage ecosystemLinuxImage; - @JavaUbuntuInstallation(imageTag = "PRIMARY", javaVersion = JavaVersion.v11) + @JavaUbuntuInstallation(imageTag = "PRIMARY", javaVersion = JavaVersion.v17) public IJavaUbuntuInstallation java; @LinuxImage(imageTag = "DOCKER", operatingSystem = OperatingSystem.ubuntu, capabilities = {"nonshared"}) From 304c1181fb87804c4ef85f259bf0fde76fe2c27a Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 28 Oct 2025 12:05:18 +0000 Subject: [PATCH 2/2] test: Rename DockerLocalJava11ubuntu to DockerLocalJava17Ubuntu now that it tests against Java 17 Signed-off-by: Jade Carino --- ...kerLocalJava11Ubuntu.java => DockerLocalJava17Ubuntu.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/{DockerLocalJava11Ubuntu.java => DockerLocalJava17Ubuntu.java} (91%) diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava17Ubuntu.java similarity index 91% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java rename to galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava17Ubuntu.java index 0ee7646..a17fa09 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava17Ubuntu.java @@ -20,9 +20,9 @@ import dev.galasa.linux.OperatingSystem; @Test -@TestAreas({"dockermanager", "localecosystem", "java11", "ubuntu"}) +@TestAreas({"dockermanager", "localecosystem", "java17", "ubuntu"}) @Tags({"codecoverage"}) -public class DockerLocalJava11Ubuntu extends AbstractDockerUbuntuLocal { +public class DockerLocalJava17Ubuntu extends AbstractDockerUbuntuLocal { @LocalEcosystem(linuxImageTag = "PRIMARY") public ILocalEcosystem ecosystem;