Use temurin in spring boot smoke test images (#15033)

Author: laurit

smoke-tests/images/security-manager/build.gradle.kts

@@ -28,7 +28,7 @@ java {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-security-manager:jdk$targetJDK-$tag"
   container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"
   container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")

smoke-tests/images/spring-boot/build.gradle.kts

@@ -37,6 +37,12 @@ java {
   if (targetJDK == "8") {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+  } else if (targetJDK == "11") {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  } else if (targetJDK == "17") {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
@@ -51,7 +57,7 @@ springBoot {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"
   container.ports = listOf("8080")
 }

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

@@ -27,7 +27,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void shouldExportMetrics(int jdk) {
     start(jdk);
     client().get("/greeting").aggregate().join();

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

@@ -24,7 +24,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  @ValueSource(ints = {8, 21}) // Security Manager removed in Java 25
   void securityManagerSmokeTest(int jdk) {
     start(jdk);
     testing.waitAndAssertTraces(

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

@@ -30,7 +30,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void springBootSmokeTest(int jdk) {
     SmokeTestOutput output = start(jdk);