Skip to content

Add the new test cases, update the SERVLET_VERSION suffix to point to the newly published images #18410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 2 commits into from
Apr 30, 2026
Merged

Add the new test cases, update the SERVLET_VERSION suffix to point to the newly published images #18410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9ab41
Add the new test cases, update the SERVLET_VERSION suffix to point to…
Channyboy Apr 29, 2026
29cac57
PR comments, remove comments.Update the WebSphere images versions as …
Channyboy Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion smoke-tests/src/test/java/io/opentelemetry/smoketest/TestImageVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
}
3 changes: 3 additions & 0 deletions ...tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertyServletOnlySmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}
40 changes: 40 additions & 0 deletions smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/LibertySmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}
4 changes: 2 additions & 2 deletions smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WebsphereSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}
Loading