Run smoke tests on OpenJ9 Java 17 and 18
follow-up to
MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy
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 = "20221127.3559314888"
+ String extraTag = "20221129.3575751672"
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
return getTargetImagePrefix() + ":" + fullSuffix
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
@@ -47,8 +47,12 @@ class Jetty9Jdk8Openj9 extends JettySmokeTest {
class Jetty9Jdk11Openj9 extends JettySmokeTest {
}
-@AppServer(version = "9.4.39", jdk = "16-openj9")
-class Jetty9Jdk16Openj9 extends JettySmokeTest {
+@AppServer(version = "9.4.39", jdk = "17-openj9")
+class Jetty9Jdk17Openj9 extends JettySmokeTest {
+}
+
+@AppServer(version = "9.4.39", jdk = "18-openj9")
+class Jetty9Jdk18Openj9 extends JettySmokeTest {
}
@AppServer(version = "10.0.7", jdk = "11")
@@ -71,8 +75,12 @@ class Jetty10Jdk20 extends JettySmokeTest {
class Jetty10Jdk11Openj9 extends JettySmokeTest {
}
-@AppServer(version = "10.0.7", jdk = "16-openj9")
-class Jetty10Jdk16Openj9 extends JettySmokeTest {
+@AppServer(version = "10.0.7", jdk = "17-openj9")
+class Jetty10Jdk17Openj9 extends JettySmokeTest {
+}
+
+@AppServer(version = "10.0.7", jdk = "18-openj9")
+class Jetty10Jdk18Openj9 extends JettySmokeTest {
}
@AppServer(version = "11.0.7", jdk = "11")
@@ -95,6 +103,10 @@ class Jetty11Jdk20 extends JettySmokeTest {
class Jetty11Jdk11Openj9 extends JettySmokeTest {
}
-@AppServer(version = "11.0.7", jdk = "16-openj9")
-class Jetty11Jdk16Openj9 extends JettySmokeTest {
+@AppServer(version = "11.0.7", jdk = "17-openj9")
+class Jetty11Jdk17Openj9 extends JettySmokeTest {
+}
+
+@AppServer(version = "11.0.7", jdk = "18-openj9")
+class Jetty11Jdk18Openj9 extends JettySmokeTest {
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy
@@ -23,14 +23,14 @@ abstract class LibertySmokeTest extends AppServerTest {
class Liberty20Jdk8 extends LibertySmokeTest {
}
-@AppServer(version = "20.0.0.12", jdk = "8-openj9")
-class Liberty20Jdk8Openj9 extends LibertySmokeTest {
-}
-
@AppServer(version = "20.0.0.12", jdk = "11")
class Liberty20Jdk11 extends LibertySmokeTest {
}
+@AppServer(version = "20.0.0.12", jdk = "8-openj9")
+class Liberty20Jdk8Openj9 extends LibertySmokeTest {
+}
+
@AppServer(version = "20.0.0.12", jdk = "11-openj9")
class Liberty20Jdk11Openj9 extends LibertySmokeTest {
}
@@ -39,22 +39,22 @@ class Liberty20Jdk11Openj9 extends LibertySmokeTest {
class Liberty21Jdk8 extends LibertySmokeTest {
}
-@AppServer(version = "21.0.0.10", jdk = "8-openj9")
-class Liberty21Jdk8Openj9 extends LibertySmokeTest {
-}
-
@AppServer(version = "21.0.0.10", jdk = "11")
class Liberty21Jdk11 extends LibertySmokeTest {
}
-@AppServer(version = "21.0.0.10", jdk = "11-openj9")
-class Liberty21Jdk11Openj9 extends LibertySmokeTest {
-}
-
@AppServer(version = "21.0.0.10", jdk = "17")
class Liberty21Jdk17 extends LibertySmokeTest {
}
-@AppServer(version = "21.0.0.10", jdk = "16-openj9")
-class Liberty21Jdk16Openj9 extends LibertySmokeTest {
+@AppServer(version = "21.0.0.10", jdk = "8-openj9")
+class Liberty21Jdk8Openj9 extends LibertySmokeTest {
+}
+
+@AppServer(version = "21.0.0.10", jdk = "11-openj9")
+class Liberty21Jdk11Openj9 extends LibertySmokeTest {
+}
+
+@AppServer(version = "21.0.0.10", jdk = "17-openj9")
+class Liberty21Jdk17Openj9 extends LibertySmokeTest {
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PayaraSmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PayaraSmokeTest.groovy
@@ -42,14 +42,14 @@ abstract class PayaraSmokeTest extends AppServerTest {
class Payara52020Jdk8 extends PayaraSmokeTest {
}
-@AppServer(version = "5.2020.6", jdk = "8-openj9")
-class Payara52020Jdk8Openj9 extends PayaraSmokeTest {
-}
-
@AppServer(version = "5.2020.6", jdk = "11")
class Payara52020Jdk11 extends PayaraSmokeTest {
}
+@AppServer(version = "5.2020.6", jdk = "8-openj9")
+class Payara52020Jdk8Openj9 extends PayaraSmokeTest {
+}
+
@AppServer(version = "5.2020.6", jdk = "11-openj9")
class Payara52020Jdk11Openj9 extends PayaraSmokeTest {
}
@@ -58,14 +58,14 @@ class Payara52020Jdk11Openj9 extends PayaraSmokeTest {
class Payara52021Jdk8 extends PayaraSmokeTest {
}
-@AppServer(version = "5.2021.8", jdk = "8-openj9")
-class Payara52021Jdk8Openj9 extends PayaraSmokeTest {
-}
-
@AppServer(version = "5.2021.8", jdk = "11")
class Payara52021Jdk11 extends PayaraSmokeTest {
}
+@AppServer(version = "5.2021.8", jdk = "8-openj9")
+class Payara52021Jdk8Openj9 extends PayaraSmokeTest {
+}
+
@AppServer(version = "5.2021.8", jdk = "11-openj9")
class Payara52021Jdk11Openj9 extends PayaraSmokeTest {
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
@@ -55,6 +55,14 @@ class Tomcat8Jdk8Openj9 extends TomcatSmokeTest {
class Tomcat8Jdk11Openj9 extends TomcatSmokeTest {
}
+@AppServer(version = "8.5.72", jdk = "17-openj9")
+class Tomcat8Jdk17Openj9 extends TomcatSmokeTest {
+}
+
+@AppServer(version = "8.5.72", jdk = "18-openj9")
+class Tomcat8Jdk18Openj9 extends TomcatSmokeTest {
+}
+
@AppServer(version = "9.0.54", jdk = "8")
class Tomcat9Jdk8 extends TomcatSmokeTest {
}
@@ -83,6 +91,14 @@ class Tomcat9Jdk8Openj9 extends TomcatSmokeTest {
class Tomcat9Jdk11Openj9 extends TomcatSmokeTest {
}
+@AppServer(version = "9.0.54", jdk = "17-openj9")
+class Tomcat9Jdk17Openj9 extends TomcatSmokeTest {
+}
+
+@AppServer(version = "9.0.54", jdk = "18-openj9")
+class Tomcat9Jdk18Openj9 extends TomcatSmokeTest {
+}
+
@AppServer(version = "10.0.12", jdk = "8")
class Tomcat10Jdk8 extends TomcatSmokeTest {
}
@@ -110,3 +126,11 @@ class Tomcat10Jdk8Openj9 extends TomcatSmokeTest {
@AppServer(version = "10.0.12", jdk = "11-openj9")
class Tomcat10Jdk11Openj9 extends TomcatSmokeTest {
}
+
+@AppServer(version = "10.0.12", jdk = "17-openj9")
+class Tomcat10Jdk17Openj9 extends TomcatSmokeTest {
+}
+
+@AppServer(version = "10.0.12", jdk = "18-openj9")
+class Tomcat10Jdk18Openj9 extends TomcatSmokeTest {
+}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
@@ -72,8 +72,12 @@ class Tomee8Jdk8Openj9 extends TomeeSmokeTest {
class Tomee8Jdk11Openj9 extends TomeeSmokeTest {
}
-@AppServer(version = "8.0.8", jdk = "16-openj9")
-class Tomee8Jdk16Openj9 extends TomeeSmokeTest {
+@AppServer(version = "8.0.8", jdk = "17-openj9")
+class Tomee8Jdk17Openj9 extends TomeeSmokeTest {
+}
+
+@AppServer(version = "8.0.8", jdk = "18-openj9")
+class Tomee8Jdk18Openj9 extends TomeeSmokeTest {
}
@AppServer(version = "9.0.0-M7", jdk = "8")
@@ -104,6 +108,10 @@ class Tomee9Jdk8Openj9 extends TomeeSmokeTest {
class Tomee9Jdk11Openj9 extends TomeeSmokeTest {
}
-@AppServer(version = "9.0.0-M7", jdk = "16-openj9")
-class Tomee9Jdk16Openj9 extends TomeeSmokeTest {
+@AppServer(version = "9.0.0-M7", jdk = "17-openj9")
+class Tomee9Jdk17Openj9 extends TomeeSmokeTest {
+}
+
+@AppServer(version = "9.0.0-M7", jdk = "18-openj9")
+class Tomee9Jdk18Openj9 extends TomeeSmokeTest {
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy
@@ -80,6 +80,22 @@ class Wildfly17Jdk19 extends WildflyJdk8SmokeTest {
class Wildfly17Jdk20 extends WildflySmokeTest {
}
+@AppServer(version = "17.0.1.Final", jdk = "8-openj9")
+class Wildfly17Jdk8Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "17.0.1.Final", jdk = "11-openj9")
+class Wildfly17Jdk11Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "17.0.1.Final", jdk = "17-openj9")
+class Wildfly17Jdk17Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "17.0.1.Final", jdk = "18-openj9")
+class Wildfly17Jdk18Openj9 extends WildflySmokeTest {
+}
+
@AppServer(version = "21.0.0.Final", jdk = "8")
class Wildfly21Jdk8 extends WildflyJdk8SmokeTest {
}
@@ -100,6 +116,22 @@ class Wildfly21Jdk19 extends WildflyJdk8SmokeTest {
class Wildfly21Jdk20 extends WildflySmokeTest {
}
+@AppServer(version = "21.0.0.Final", jdk = "8-openj9")
+class Wildfly21Jdk8Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "21.0.0.Final", jdk = "11-openj9")
+class Wildfly21Jdk11Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "21.0.0.Final", jdk = "17-openj9")
+class Wildfly21Jdk17Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "21.0.0.Final", jdk = "18-openj9")
+class Wildfly21Jdk18Openj9 extends WildflySmokeTest {
+}
+
@AppServer(version = "25.0.1.Final", jdk = "8")
class Wildfly25Jdk8 extends WildflyJdk8SmokeTest {
}
@@ -120,30 +152,6 @@ class Wildfly25Jdk19 extends WildflyJdk8SmokeTest {
class Wildfly25Jdk20 extends WildflySmokeTest {
}
-@AppServer(version = "17.0.1.Final", jdk = "8-openj9")
-class Wildfly17Jdk8Openj9 extends WildflySmokeTest {
-}
-
-@AppServer(version = "17.0.1.Final", jdk = "11-openj9")
-class Wildfly17Jdk11Openj9 extends WildflySmokeTest {
-}
-
-@AppServer(version = "17.0.1.Final", jdk = "16-openj9")
-class Wildfly17Jdk16Openj9 extends WildflySmokeTest {
-}
-
-@AppServer(version = "21.0.0.Final", jdk = "8-openj9")
-class Wildfly21Jdk8Openj9 extends WildflySmokeTest {
-}
-
-@AppServer(version = "21.0.0.Final", jdk = "11-openj9")
-class Wildfly21Jdk11Openj9 extends WildflySmokeTest {
-}
-
-@AppServer(version = "21.0.0.Final", jdk = "16-openj9")
-class Wildfly21Jdk16Openj9 extends WildflySmokeTest {
-}
-
@AppServer(version = "25.0.1.Final", jdk = "8-openj9")
class Wildfly25Jdk8Openj9 extends WildflySmokeTest {
}
@@ -152,6 +160,10 @@ class Wildfly25Jdk8Openj9 extends WildflySmokeTest {
class Wildfly25Jdk11Openj9 extends WildflySmokeTest {
}
-@AppServer(version = "25.0.1.Final", jdk = "16-openj9")
-class Wildfly25Jdk16Openj9 extends WildflySmokeTest {
+@AppServer(version = "25.0.1.Final", jdk = "17-openj9")
+class Wildfly25Jdk17Openj9 extends WildflySmokeTest {
+}
+
+@AppServer(version = "25.0.1.Final", jdk = "18-openj9")
+class Wildfly25Jdk18Openj9 extends WildflySmokeTest {
}

Run smoke tests on OpenJ9 Java 17 and 18 (#7340)

follow-up to #7333