Remove Java 20, part 2 (#15370)

Author: trask

smoke-tests/images/servlet/build.gradle.kts

@@ -34,7 +34,7 @@ val targets = mapOf(
     ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")),
     ImageTarget(listOf("21.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11", "17"), mapOf("release" to "2021-11-17_1256")),
     ImageTarget(listOf("22.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11", "17"), mapOf("release" to "22.0.0.12")),
-    ImageTarget(listOf("23.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "20", "21"), mapOf("release" to "23.0.0.12")),
+    ImageTarget(listOf("23.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21"), mapOf("release" to "23.0.0.12")),
   ),
   "payara" to listOf(
     ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
@@ -166,7 +166,6 @@ fun configureImage(
         "8" -> "eclipse-temurin:8u472-b08-jdk-windowsservercore-ltsc2022@sha256:46d804b1c8a658fd84b8f3b3f39a1739b0f0ffccf41a682cea4847982de3bd08"
         "11" -> "eclipse-temurin:11.0.29_7-jdk-windowsservercore-ltsc2022@sha256:3b16568beff29ff623e7d72018cd6b08f4003964a342a907ad410a0b953f40e6"
         "17" -> "eclipse-temurin:17.0.17_10-jdk-windowsservercore-ltsc2022@sha256:7c9e423728d04540c0a30d68ca0922390665dfec20e012beb95861d80aa2dd70"
-        "20" -> "eclipse-temurin:20.0.2_9-jdk-windowsservercore-ltsc2022@sha256:233f6f550bb26967ff6efeb48c5474432f2e9e46f15673210252e45cf58f24cb"
         "21" -> "eclipse-temurin:21.0.9_10-jdk-windowsservercore-ltsc2022@sha256:45a3d356d018942a497b877633f19db401828ecb2a1de3cda635b98d08bfbaeb"
         "25" -> "eclipse-temurin:25.0.1_8-jdk-windowsservercore-ltsc2022@sha256:556d727eb539fd9c6242e75d17e1a2bf59456ea8a37478cfbd6406ca6db0d2d1"
         else -> throw GradleException("Unexpected jdk version for Windows: $jdk")
@@ -176,7 +175,6 @@ fun configureImage(
         "8" -> "eclipse-temurin:8u472-b08-jdk@sha256:b4e05de303ea02659ee17044d6b68caadfc462f1530f3a461482afee23379cdd"
         "11" -> "eclipse-temurin:11.0.29_7-jdk@sha256:189ce1c8831fa5bdd801127dad99f68a17615f81f4aa839b1a4aae693261929a"
         "17" -> "eclipse-temurin:17.0.17_10-jdk@sha256:5a66a3ffd8728ed6c76eb4ec674c37991ac679927381f71774f5aa44cf420082"
-        "20" -> "eclipse-temurin:20.0.2_9-jdk@sha256:a8010918241007417c8c0ce7d203cf110f8c945b56da01a13eb55af7eb3d3175"
         "21" -> "eclipse-temurin:21.0.9_10-jdk@sha256:ec2005c536f3661c6ef1253292c9c623e582186749a3ef2ed90903d1aaf74640"
         "25" -> "eclipse-temurin:25.0.1_8-jdk@sha256:adc4533ea69967c783ac2327dac7ff548fcf6401a7e595e723b414c0a7920eb2"
         else -> throw GradleException("Unexpected jdk version for Linux: $jdk")
@@ -191,7 +189,6 @@ fun configureImage(
         "8" -> "ibm-semeru-runtimes:open-8u472-b08-jdk@sha256:63bb8aad02000edbc5f90222a018862f546a0ac21ec01d6b31af6202083297e8"
         "11" -> "ibm-semeru-runtimes:open-11.0.29_7-jdk@sha256:a0910e6646e71de764f56ea19238719cb150ffabb46c0f9d3323e4cb697d59dc"
         "17" -> "ibm-semeru-runtimes:open-17-jdk@sha256:ad9a76a79afef5f01b49d3a7487e017305cb76f7421cd88e9424ee1c96fe8c09"
-        "20" -> "ibm-semeru-runtimes:open-20.0.2_9-jdk@sha256:e950be308506f63b61a196b55dc53059317dc32e0c25c5d863bfb4ef6911922a"
         "21" -> "ibm-semeru-runtimes:open-21.0.9_10-jdk@sha256:bd69dbe68315b72ebfa0d708511176c3317dd0c500dc462e7041570983f14c49"
         "25" -> "ibm-semeru-runtimes:open-25-jdk@sha256:58f8efd0e2b137c19e192a3d1a36e9efe070d6f59784bc4a84f551e6c148b35c"
         else -> throw GradleException("Unexpected jdk version for openj9: $jdk")

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

@@ -20,5 +20,7 @@ public final class TestImageVersions {
 
   public static final String ZULU_OPENJDK_8U31_VERSION = "20251117.19421579350";
 
+  public static final String SERVLET_VERSION = "20251118.19478518185";
+
   private TestImageVersions() {}
 }

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

@@ -23,6 +23,7 @@
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 import io.opentelemetry.smoketest.AbstractSmokeTest;
 import io.opentelemetry.smoketest.TestContainerManager;
+import io.opentelemetry.smoketest.TestImageVersions;
 import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
 import io.opentelemetry.testing.internal.armeria.common.HttpMethod;
 import io.opentelemetry.testing.internal.armeria.common.RequestHeaders;
@@ -64,7 +65,7 @@ void afterAll() {
   static Function<AppServerImage, String> appServerImage(String targetImagePrefix) {
     return a -> {
       String platformSuffix = a.isWindows() ? "-windows" : "";
-      String extraTag = "-20251014.18508284308";
+      String extraTag = "-" + TestImageVersions.SERVLET_VERSION;
       String fullSuffix = a.getServerVersion() + "-jdk" + a.getJdk() + platformSuffix + extraTag;
       return targetImagePrefix + ":" + fullSuffix;
     };

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

@@ -103,9 +103,9 @@ static class Liberty23Jdk17 extends LibertySmokeTest {}
   @AppServer(version = "23.0.0.12", jdk = "17-openj9")
   static class Liberty23Jdk17Openj9 extends LibertySmokeTest {}
 
-  @AppServer(version = "23.0.0.12", jdk = "20")
-  static class Liberty23Jdk20 extends LibertySmokeTest {}
+  @AppServer(version = "23.0.0.12", jdk = "21")
+  static class Liberty23Jdk21 extends LibertySmokeTest {}
 
-  @AppServer(version = "23.0.0.12", jdk = "20-openj9")
-  static class Liberty23Jdk20Openj9 extends LibertySmokeTest {}
+  @AppServer(version = "23.0.0.12", jdk = "21-openj9")
+  static class Liberty23Jdk21Openj9 extends LibertySmokeTest {}
 }