diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 7fab506784..66cb21a6f4 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -48,7 +48,7 @@ abstract class AppServerTest extends SmokeTest { @Override protected String getTargetImage(String jdk, String serverVersion, boolean windows) { String platformSuffix = windows ? "-windows" : "" - String extraTag = "20211108.1435776715" + String extraTag = "20211216.1584506476" String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag" return getTargetImagePrefix() + ":" + fullSuffix } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy index ce9024322d..0d4a58537c 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy @@ -23,6 +23,11 @@ abstract class JettyJpmsSmokeTest extends AppServerTest { @AppServer(version = "11.0.7", jdk = "11") class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest { } + @AppServer(version = "11.0.7", jdk = "17") class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest { -} \ No newline at end of file +} + +@AppServer(version = "11.0.7", jdk = "18") +class Jetty11JpmsJdk18 extends JettyJpmsSmokeTest { +} diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy index dfc1d34925..5d60e7a5b3 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy @@ -15,42 +15,67 @@ abstract class JettySmokeTest extends AppServerTest { @AppServer(version = "9.4.39", jdk = "8") class Jetty9Jdk8 extends JettySmokeTest { } + @AppServer(version = "9.4.39", jdk = "11") class Jetty9Jdk11 extends JettySmokeTest { } + @AppServer(version = "9.4.39", jdk = "17") class Jetty9Jdk17 extends JettySmokeTest { } + +@AppServer(version = "9.4.39", jdk = "18") +class Jetty9Jdk18 extends JettySmokeTest { +} + @AppServer(version = "9.4.39", jdk = "8-openj9") class Jetty9Jdk8Openj9 extends JettySmokeTest { } + @AppServer(version = "9.4.39", jdk = "11-openj9") class Jetty9Jdk11Openj9 extends JettySmokeTest { } + @AppServer(version = "9.4.39", jdk = "16-openj9") class Jetty9Jdk16Openj9 extends JettySmokeTest { } + @AppServer(version = "10.0.7", jdk = "11") class Jetty10Jdk11 extends JettySmokeTest { } + @AppServer(version = "10.0.7", jdk = "17") class Jetty10Jdk17 extends JettySmokeTest { } + +@AppServer(version = "10.0.7", jdk = "18") +class Jetty10Jdk18 extends JettySmokeTest { +} + @AppServer(version = "10.0.7", jdk = "11-openj9") class Jetty10Jdk11Openj9 extends JettySmokeTest { } + @AppServer(version = "10.0.7", jdk = "16-openj9") class Jetty10Jdk16Openj9 extends JettySmokeTest { } + @AppServer(version = "11.0.7", jdk = "11") class Jetty11Jdk11 extends JettySmokeTest { } + @AppServer(version = "11.0.7", jdk = "17") class Jetty11Jdk17 extends JettySmokeTest { } + +@AppServer(version = "11.0.7", jdk = "18") +class Jetty11Jdk18 extends JettySmokeTest { +} + @AppServer(version = "11.0.7", jdk = "11-openj9") class Jetty11Jdk11Openj9 extends JettySmokeTest { } + @AppServer(version = "11.0.7", jdk = "16-openj9") class Jetty11Jdk16Openj9 extends JettySmokeTest { } \ No newline at end of file diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy index 4f7ada433f..bdf6e4b558 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy @@ -22,36 +22,47 @@ abstract class LibertySmokeTest extends AppServerTest { @AppServer(version = "20.0.0.12", jdk = "8") 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 = "11-openj9") class Liberty20Jdk11Openj9 extends LibertySmokeTest { } + @AppServer(version = "20.0.0.12", jdk = "16") class Liberty20Jdk16 extends LibertySmokeTest { } + @AppServer(version = "20.0.0.12", jdk = "16-openj9") class Liberty20Jdk16Openj9 extends LibertySmokeTest { } + @AppServer(version = "21.0.0.10", jdk = "8") 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 { } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy index 3fa5f14826..b7265c3377 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy @@ -15,51 +15,79 @@ abstract class TomcatSmokeTest extends AppServerTest { @AppServer(version = "7.0.109", jdk = "8") class Tomcat7Jdk8 extends TomcatSmokeTest { } + @AppServer(version = "7.0.109", jdk = "8-openj9") class Tomcat7Jdk8Openj9 extends TomcatSmokeTest { } + @AppServer(version = "8.5.72", jdk = "8") class Tomcat8Jdk8 extends TomcatSmokeTest { } + @AppServer(version = "8.5.72", jdk = "11") class Tomcat8Jdk11 extends TomcatSmokeTest { } + @AppServer(version = "8.5.72", jdk = "17") class Tomcat8Jdk17 extends TomcatSmokeTest { } + +@AppServer(version = "8.5.72", jdk = "18") +class Tomcat8Jdk18 extends TomcatSmokeTest { +} + @AppServer(version = "8.5.72", jdk = "8-openj9") class Tomcat8Jdk8Openj9 extends TomcatSmokeTest { } + @AppServer(version = "8.5.72", jdk = "11-openj9") class Tomcat8Jdk11Openj9 extends TomcatSmokeTest { } + @AppServer(version = "9.0.54", jdk = "8") class Tomcat9Jdk8 extends TomcatSmokeTest { } + @AppServer(version = "9.0.54", jdk = "11") class Tomcat9Jdk11 extends TomcatSmokeTest { } + @AppServer(version = "9.0.54", jdk = "17") class Tomcat9Jdk17 extends TomcatSmokeTest { } + +@AppServer(version = "9.0.54", jdk = "18") +class Tomcat9Jdk18 extends TomcatSmokeTest { +} + @AppServer(version = "9.0.54", jdk = "8-openj9") class Tomcat9Jdk8Openj9 extends TomcatSmokeTest { } + @AppServer(version = "9.0.54", jdk = "11-openj9") class Tomcat9Jdk11Openj9 extends TomcatSmokeTest { } + @AppServer(version = "10.0.12", jdk = "8") class Tomcat10Jdk8 extends TomcatSmokeTest { } + @AppServer(version = "10.0.12", jdk = "11") class Tomcat10Jdk11 extends TomcatSmokeTest { } + @AppServer(version = "10.0.12", jdk = "17") class Tomcat10Jdk17 extends TomcatSmokeTest { } + +@AppServer(version = "10.0.12", jdk = "18") +class Tomcat10Jdk18 extends TomcatSmokeTest { +} + @AppServer(version = "10.0.12", jdk = "8-openj9") class Tomcat10Jdk8Openj9 extends TomcatSmokeTest { } + @AppServer(version = "10.0.12", jdk = "11-openj9") class Tomcat10Jdk11Openj9 extends TomcatSmokeTest { } \ No newline at end of file diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy index 1457e87833..b55c2c87d3 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy @@ -31,48 +31,71 @@ abstract class TomeeSmokeTest extends AppServerTest { @AppServer(version = "7.0.9", jdk = "8") class Tomee70Jdk8 extends TomeeSmokeTest { } + @AppServer(version = "7.0.9", jdk = "8-openj9") class Tomee70Jdk8Openj9 extends TomeeSmokeTest { } + @AppServer(version = "7.1.4", jdk = "8") class Tomee71Jdk8 extends TomeeSmokeTest { } + @AppServer(version = "7.1.4", jdk = "8-openj9") class Tomee71Jdk8Openj9 extends TomeeSmokeTest { } + @AppServer(version = "8.0.8", jdk = "8") class Tomee8Jdk8 extends TomeeSmokeTest { } + @AppServer(version = "8.0.8", jdk = "11") class Tomee8Jdk11 extends TomeeSmokeTest { } + @AppServer(version = "8.0.8", jdk = "17") class Tomee8Jdk17 extends TomeeSmokeTest { } + +@AppServer(version = "8.0.8", jdk = "18") +class Tomee8Jdk18 extends TomeeSmokeTest { +} + @AppServer(version = "8.0.8", jdk = "8-openj9") class Tomee8Jdk8Openj9 extends TomeeSmokeTest { } + @AppServer(version = "8.0.8", jdk = "11-openj9") class Tomee8Jdk11Openj9 extends TomeeSmokeTest { } + @AppServer(version = "8.0.8", jdk = "16-openj9") class Tomee8Jdk16Openj9 extends TomeeSmokeTest { } + @AppServer(version = "9.0.0-M7", jdk = "8") class Tomee9Jdk8 extends TomeeSmokeTest { } + @AppServer(version = "9.0.0-M7", jdk = "11") class Tomee9Jdk11 extends TomeeSmokeTest { } + @AppServer(version = "9.0.0-M7", jdk = "17") class Tomee9Jdk17 extends TomeeSmokeTest { } + +@AppServer(version = "9.0.0-M7", jdk = "18") +class Tomee9Jdk18 extends TomeeSmokeTest { +} + @AppServer(version = "9.0.0-M7", jdk = "8-openj9") class Tomee9Jdk8Openj9 extends TomeeSmokeTest { } + @AppServer(version = "9.0.0-M7", jdk = "11-openj9") class Tomee9Jdk11Openj9 extends TomeeSmokeTest { } + @AppServer(version = "9.0.0-M7", jdk = "16-openj9") class Tomee9Jdk16Openj9 extends TomeeSmokeTest { } \ No newline at end of file diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy index 0cfe92fc63..5ab91ed0d1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WebsphereSmokeTest.groovy @@ -34,9 +34,10 @@ abstract class WebsphereSmokeTest extends AppServerTest { } } -@AppServer(version = "8.5.5.20", jdk = "8-openj9") +@AppServer(version = "8.5.5.19", jdk = "8-openj9") class Websphere8Jdk8Openj9 extends WebsphereSmokeTest { } + @AppServer(version = "9.0.5.9", jdk = "8-openj9") class Websphere9Jdk8Openj9 extends WebsphereSmokeTest { } \ No newline at end of file diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy index 1a69a8e28c..0054a1fc63 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy @@ -37,60 +37,91 @@ abstract class WildflySmokeTest extends AppServerTest { @AppServer(version = "13.0.0.Final", jdk = "8") class Wildfly13Jdk8 extends WildflySmokeTest { } + @AppServer(version = "13.0.0.Final", jdk = "8-openj9") class Wildfly13Jdk8Openj9 extends WildflySmokeTest { } + @AppServer(version = "17.0.1.Final", jdk = "8") class Wildfly17Jdk8 extends WildflySmokeTest { } + @AppServer(version = "17.0.1.Final", jdk = "11") class Wildfly17Jdk11 extends WildflySmokeTest { } + @AppServer(version = "17.0.1.Final", jdk = "17") class Wildfly17Jdk17 extends WildflySmokeTest { } + +@AppServer(version = "17.0.1.Final", jdk = "18") +class Wildfly17Jdk18 extends WildflySmokeTest { +} + @AppServer(version = "21.0.0.Final", jdk = "8") class Wildfly21Jdk8 extends WildflySmokeTest { } + @AppServer(version = "21.0.0.Final", jdk = "11") class Wildfly21Jdk11 extends WildflySmokeTest { } + @AppServer(version = "21.0.0.Final", jdk = "17") class Wildfly21Jdk17 extends WildflySmokeTest { } + +@AppServer(version = "21.0.0.Final", jdk = "18") +class Wildfly21Jdk18 extends WildflySmokeTest { +} + @AppServer(version = "25.0.1.Final", jdk = "8") class Wildfly25Jdk8 extends WildflySmokeTest { } + @AppServer(version = "25.0.1.Final", jdk = "11") class Wildfly25Jdk11 extends WildflySmokeTest { } + @AppServer(version = "25.0.1.Final", jdk = "17") class Wildfly25Jdk17 extends WildflySmokeTest { } + +@AppServer(version = "25.0.1.Final", jdk = "18") +class Wildfly25Jdk18 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 { } + @AppServer(version = "25.0.1.Final", jdk = "11-openj9") class Wildfly25Jdk11Openj9 extends WildflySmokeTest { } + @AppServer(version = "25.0.1.Final", jdk = "16-openj9") class Wildfly25Jdk16Openj9 extends WildflySmokeTest { } \ No newline at end of file