Update Liberty versions (open-telemetry#7857)

Open Liberty version 20.0.0.x are out of support. This PR removes 20.0.0.x and adds 22.0.0.x.
tylerbenson · Mar 2, 2023 · ee781f5 · ee781f5
1 parent 7e05d32
commit ee781f5
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 28 deletions.
diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -164,7 +164,7 @@ These are the application servers that the smoke tests are run against:
 | [Tomcat](http://tomcat.apache.org/)                                                       | 7.0.x                       | OpenJDK 8         | [`ubuntu-latest`], [`windows-latest`] |
 | [Tomcat](http://tomcat.apache.org/)                                                       | 7.0.x, 8.5.x, 9.0.x, 10.0.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
 | [TomEE](https://tomee.apache.org/)                                                        | 7.x, 8.x                    | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
-| [Open Liberty](https://openliberty.io/)                                                   | 20.x, 21.x                  | OpenJDK 8         | [`ubuntu-latest`], [`windows-latest`] |
+| [Open Liberty](https://openliberty.io/)                                                   | 21.x, 22.x                  | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
 | [Websphere Traditional](https://www.ibm.com/uk-en/cloud/websphere-application-server)     | 8.5.5.x, 9.0.x              | IBM JDK 8         | Red Hat Enterprise Linux 8.4   |
 | [WildFly](https://www.wildfly.org/)                                                       | 13.x                        | OpenJDK 8         | [`ubuntu-latest`], [`windows-latest`] |
 | [WildFly](https://www.wildfly.org/)                                                       | 17.x, 21.x, 25.x            | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy
@@ -54,7 +54,7 @@ abstract class AppServerTest extends SmokeTest {
   @Override
   protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
     String platformSuffix = windows ? "-windows" : ""
-    String extraTag = "20221129.3575751672"
+    String extraTag = "20230301.4309128636"
     String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
     return getTargetImagePrefix() + ":" + fullSuffix
   }

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy
@@ -28,10 +28,10 @@ abstract class LibertyServletOnlySmokeTest extends LibertySmokeTest {
   }
 }
 
-@AppServer(version = "20.0.0.12", jdk = "11")
-class LibertyServletOnly20Jdk11 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "11")
+class LibertyServletOnly21Jdk11 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "11")
-class LibertyServletOnly21Jdk11 extends LibertySmokeTest {
+@AppServer(version = "22.0.0.12", jdk = "11")
+class LibertyServletOnly22Jdk11 extends LibertySmokeTest {
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy
@@ -19,42 +19,54 @@ abstract class LibertySmokeTest extends AppServerTest {
   }
 }
 
-@AppServer(version = "20.0.0.12", jdk = "8")
-class Liberty20Jdk8 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "8")
+class Liberty21Jdk8 extends LibertySmokeTest {
 }
 
-@AppServer(version = "20.0.0.12", jdk = "11")
-class Liberty20Jdk11 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "11")
+class Liberty21Jdk11 extends LibertySmokeTest {
 }
 
-@AppServer(version = "20.0.0.12", jdk = "8-openj9")
-class Liberty20Jdk8Openj9 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "17")
+class Liberty21Jdk17 extends LibertySmokeTest {
 }
 
-@AppServer(version = "20.0.0.12", jdk = "11-openj9")
-class Liberty20Jdk11Openj9 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "8-openj9")
+class Liberty21Jdk8Openj9 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "8")
-class Liberty21Jdk8 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "11-openj9")
+class Liberty21Jdk11Openj9 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "11")
-class Liberty21Jdk11 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.12", jdk = "17-openj9")
+class Liberty21Jdk17Openj9 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "17")
-class Liberty21Jdk17 extends LibertySmokeTest {
+@AppServer(version = "22.0.0.12", jdk = "8")
+class Liberty22Jdk8 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "8-openj9")
-class Liberty21Jdk8Openj9 extends LibertySmokeTest {
+@AppServer(version = "22.0.0.12", jdk = "11")
+class Liberty22Jdk11 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "11-openj9")
-class Liberty21Jdk11Openj9 extends LibertySmokeTest {
+@AppServer(version = "22.0.0.12", jdk = "17")
+class Liberty22Jdk17 extends LibertySmokeTest {
 }
 
-@AppServer(version = "21.0.0.10", jdk = "17-openj9")
-class Liberty21Jdk17Openj9 extends LibertySmokeTest {
+@AppServer(version = "22.0.0.12", jdk = "19")
+class Liberty22Jdk19 extends LibertySmokeTest {
+}
+
+@AppServer(version = "22.0.0.12", jdk = "8-openj9")
+class Liberty22Jdk8Openj9 extends LibertySmokeTest {
+}
+
+@AppServer(version = "22.0.0.12", jdk = "11-openj9")
+class Liberty22Jdk11Openj9 extends LibertySmokeTest {
+}
+
+@AppServer(version = "22.0.0.12", jdk = "17-openj9")
+class Liberty22Jdk17Openj9 extends LibertySmokeTest {
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy
@@ -34,10 +34,10 @@ abstract class WebsphereSmokeTest extends AppServerTest {
   }
 }
 
-@AppServer(version = "8.5.5.19", jdk = "8-openj9")
+@AppServer(version = "8.5.5.22", jdk = "8-openj9")
 class Websphere8Jdk8Openj9 extends WebsphereSmokeTest {
 }
 
-@AppServer(version = "9.0.5.9", jdk = "8-openj9")
+@AppServer(version = "9.0.5.14", jdk = "8-openj9")
 class Websphere9Jdk8Openj9 extends WebsphereSmokeTest {
 }