Skip to content

Commit 881f642

Browse files
authored
Add the new test cases, update the SERVLET_VERSION suffix to point to the newly published images (open-telemetry#18410)
1 parent 0d8e2dc commit 881f642

4 files changed

Lines changed: 46 additions & 3 deletions

File tree

smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class TestImageVersions {
2727
public static final String ZULU_OPENJDK_8U31_VERSION = "20251117.19421579350";
2828

2929
// smoke-test-servlet-* (all servlet variants)
30-
public static final String SERVLET_VERSION = "20251120.19538040041";
30+
public static final String SERVLET_VERSION = "20260429.25096195273";
3131

3232
private TestImageVersions() {}
3333
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ static class LibertyServletOnly22Jdk11 extends LibertyServletOnlySmokeTest {}
4040

4141
@AppServer(version = "23.0.0.12", jdk = "11")
4242
static class LibertyServletOnly23Jdk11 extends LibertyServletOnlySmokeTest {}
43+
44+
@AppServer(version = "26.0.0.3", jdk = "11")
45+
static class LibertyServletOnly26Jdk11 extends LibertyServletOnlySmokeTest {}
4346
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,44 @@ static class Liberty23Jdk21 extends LibertySmokeTest {}
108108

109109
@AppServer(version = "23.0.0.12", jdk = "21-openj9")
110110
static class Liberty23Jdk21Openj9 extends LibertySmokeTest {}
111+
112+
@AppServer(version = "26.0.0.3", jdk = "8")
113+
static class Liberty26Jdk8 extends LibertySmokeTest {
114+
@Override
115+
protected boolean testJsp() {
116+
return false;
117+
}
118+
}
119+
120+
@AppServer(version = "26.0.0.3", jdk = "8-openj9")
121+
static class Liberty26Jdk8Openj9 extends LibertySmokeTest {
122+
@Override
123+
protected boolean testJsp() {
124+
return false;
125+
}
126+
}
127+
128+
@AppServer(version = "26.0.0.3", jdk = "11")
129+
static class Liberty26Jdk11 extends LibertySmokeTest {}
130+
131+
@AppServer(version = "26.0.0.3", jdk = "11-openj9")
132+
static class Liberty26Jdk11Openj9 extends LibertySmokeTest {}
133+
134+
@AppServer(version = "26.0.0.3", jdk = "17")
135+
static class Liberty26Jdk17 extends LibertySmokeTest {}
136+
137+
@AppServer(version = "26.0.0.3", jdk = "17-openj9")
138+
static class Liberty26Jdk17Openj9 extends LibertySmokeTest {}
139+
140+
@AppServer(version = "26.0.0.3", jdk = "21")
141+
static class Liberty26Jdk21 extends LibertySmokeTest {}
142+
143+
@AppServer(version = "26.0.0.3", jdk = "21-openj9")
144+
static class Liberty26Jdk21Openj9 extends LibertySmokeTest {}
145+
146+
@AppServer(version = "26.0.0.3", jdk = "25")
147+
static class Liberty26Jdk25 extends LibertySmokeTest {}
148+
149+
@AppServer(version = "26.0.0.3", jdk = "25-openj9")
150+
static class Liberty26Jdk25Openj9 extends LibertySmokeTest {}
111151
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ protected boolean testRequestOutsideDeployedApp() {
3535
return false;
3636
}
3737

38-
@AppServer(version = "8.5.5.22", jdk = "8-openj9")
38+
@AppServer(version = "8.5.5.29", jdk = "8-openj9")
3939
static class Websphere8Jdk8Openj9 extends WebsphereSmokeTest {}
4040

41-
@AppServer(version = "9.0.5.14", jdk = "8-openj9")
41+
@AppServer(version = "9.0.5.27", jdk = "8-openj9")
4242
static class Websphere9Jdk8Openj9 extends WebsphereSmokeTest {}
4343
}

0 commit comments

Comments
 (0)