diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java index 2511e4e37a66..93064f9981b0 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java @@ -27,7 +27,7 @@ public class TestImageVersions { public static final String ZULU_OPENJDK_8U31_VERSION = "20251117.19421579350"; // smoke-test-servlet-* (all servlet variants) - public static final String SERVLET_VERSION = "20251120.19538040041"; + public static final String SERVLET_VERSION = "20260429.25096195273"; private TestImageVersions() {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java index d545ef0f4177..5f8f01d54d75 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java @@ -40,4 +40,7 @@ static class LibertyServletOnly22Jdk11 extends LibertyServletOnlySmokeTest {} @AppServer(version = "23.0.0.12", jdk = "11") static class LibertyServletOnly23Jdk11 extends LibertyServletOnlySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "11") + static class LibertyServletOnly26Jdk11 extends LibertyServletOnlySmokeTest {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java index bc2153fdbd74..1fe791518edb 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java @@ -108,4 +108,44 @@ static class Liberty23Jdk21 extends LibertySmokeTest {} @AppServer(version = "23.0.0.12", jdk = "21-openj9") static class Liberty23Jdk21Openj9 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "8") + static class Liberty26Jdk8 extends LibertySmokeTest { + @Override + protected boolean testJsp() { + return false; + } + } + + @AppServer(version = "26.0.0.3", jdk = "8-openj9") + static class Liberty26Jdk8Openj9 extends LibertySmokeTest { + @Override + protected boolean testJsp() { + return false; + } + } + + @AppServer(version = "26.0.0.3", jdk = "11") + static class Liberty26Jdk11 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "11-openj9") + static class Liberty26Jdk11Openj9 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "17") + static class Liberty26Jdk17 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "17-openj9") + static class Liberty26Jdk17Openj9 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "21") + static class Liberty26Jdk21 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "21-openj9") + static class Liberty26Jdk21Openj9 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "25") + static class Liberty26Jdk25 extends LibertySmokeTest {} + + @AppServer(version = "26.0.0.3", jdk = "25-openj9") + static class Liberty26Jdk25Openj9 extends LibertySmokeTest {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java index 5f85cdf01bf9..f8423b58fb2b 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java @@ -35,9 +35,9 @@ protected boolean testRequestOutsideDeployedApp() { return false; } - @AppServer(version = "8.5.5.22", jdk = "8-openj9") + @AppServer(version = "8.5.5.29", jdk = "8-openj9") static class Websphere8Jdk8Openj9 extends WebsphereSmokeTest {} - @AppServer(version = "9.0.5.14", jdk = "8-openj9") + @AppServer(version = "9.0.5.27", jdk = "8-openj9") static class Websphere9Jdk8Openj9 extends WebsphereSmokeTest {} }