Add Java 18 smoke test images (#4905)

* Add Java 18 smoke test images * alpine images only exist for recent jdks * Fix servlet image build * Revert for liberty
open-telemetry · Dec 15, 2021 · bd0ff33 · bd0ff33
1 parent b01efec
commit bd0ff33
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/pr-smoke-test-grpc-images.yml b/.github/workflows/pr-smoke-test-grpc-images.yml
@@ -37,4 +37,5 @@ jobs:
           ./gradlew jibDockerBuild -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
           ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
           ./gradlew jibDockerBuild -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jibDockerBuild -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain
         working-directory: smoke-tests/images/grpc
diff --git a/.github/workflows/pr-smoke-test-quarkus-images.yml b/.github/workflows/pr-smoke-test-quarkus-images.yml
@@ -37,4 +37,5 @@ jobs:
         run: |
           ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
           ./gradlew jibDockerBuild -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jibDockerBuild -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain
         working-directory: smoke-tests/images/quarkus
diff --git a/.github/workflows/pr-smoke-test-spring-boot-images.yml b/.github/workflows/pr-smoke-test-spring-boot-images.yml
@@ -37,4 +37,5 @@ jobs:
           ./gradlew jibDockerBuild -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
           ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
           ./gradlew jibDockerBuild -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jibDockerBuild -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain
         working-directory: smoke-tests/images/spring-boot
diff --git a/.github/workflows/publish-smoke-test-grpc-images.yml b/.github/workflows/publish-smoke-test-grpc-images.yml
@@ -49,6 +49,7 @@ jobs:
           ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
+          ./gradlew jib -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
         working-directory: smoke-tests/images/grpc
 
   issue:

diff --git a/.github/workflows/publish-smoke-test-quarkus-images.yml b/.github/workflows/publish-smoke-test-quarkus-images.yml
@@ -49,6 +49,7 @@ jobs:
           echo "Pushing to tag $TAG"
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
+          ./gradlew jib -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
         working-directory: smoke-tests/images/quarkus
 
   issue:

diff --git a/.github/workflows/publish-smoke-test-spring-boot-images.yml b/.github/workflows/publish-smoke-test-spring-boot-images.yml
@@ -49,6 +49,7 @@ jobs:
           ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
+          ./gradlew jib -PtargetJDK=18 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
         working-directory: smoke-tests/images/spring-boot
 
   issue:

diff --git a/smoke-tests/images/grpc/build.gradle b/smoke-tests/images/grpc/build.gradle
@@ -42,6 +42,6 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
 
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  from.image = "openjdk:$targetJDK"
   to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$targetJDK-$tag"
 }
diff --git a/smoke-tests/images/play/build.gradle b/smoke-tests/images/play/build.gradle
@@ -39,7 +39,7 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
 
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  from.image = "openjdk:$targetJDK"
   to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$targetJDK-$tag"
   container.mainClass = "play.core.server.ProdServerStart"
 }
diff --git a/smoke-tests/images/quarkus/build.gradle b/smoke-tests/images/quarkus/build.gradle
@@ -33,7 +33,7 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
 
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  from.image = "openjdk:$targetJDK"
   to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$targetJDK-$tag"
   container {
     mainClass = 'bogus'  // to suppress Jib warning about missing main class

diff --git a/smoke-tests/images/servlet/build.gradle b/smoke-tests/images/servlet/build.gradle
@@ -30,16 +30,17 @@ tasks.create("pushMatrix", DockerPushImage) {
 // Dockerfile name, args key passes raw arguments to docker build
 def targets = [
   "jetty"    : [
-    [version: ["9.4.39"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [sourceVersion: "9.4.39.v20210325"]],
+    [version: ["9.4.39"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"], args: [sourceVersion: "9.4.39.v20210325"]],
     [version: ["9.4.39"], vm: ["openj9"], jdk: ["8", "11", "16"], args: [sourceVersion: "9.4.39.v20210325"]],
-    [version: ["10.0.7"], vm: ["hotspot"], jdk: ["11", "17"], args: [sourceVersion: "10.0.7"]],
+    [version: ["10.0.7"], vm: ["hotspot"], jdk: ["11", "17", "18"], args: [sourceVersion: "10.0.7"]],
     [version: ["10.0.7"], vm: ["openj9"], jdk: ["11", "16"], args: [sourceVersion: "10.0.7"]],
-    [version: ["11.0.7"], vm: ["hotspot"], jdk: ["11", "17"], args: [sourceVersion: "11.0.7"], war: "servlet-5.0"],
+    [version: ["11.0.7"], vm: ["hotspot"], jdk: ["11", "17", "18"], args: [sourceVersion: "11.0.7"], war: "servlet-5.0"],
     [version: ["11.0.7"], vm: ["openj9"], jdk: ["11", "16"], args: [sourceVersion: "11.0.7"], war: "servlet-5.0"]
   ],
   "liberty"  : [
     // running configure.sh is failing while building the image with Java 17
     [version: ["20.0.0.12"], vm: ["hotspot", "openj9"], jdk: ["8", "11", "16"], args: [release: "2020-11-11_0736"]],
+    // running configure.sh is failing while building the image with Java 18
     [version: ["21.0.0.10"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [release: "2021-09-20_1900"]],
     [version: ["21.0.0.10"], vm: ["openj9"], jdk: ["8", "11", "16"], args: [release: "2021-09-20_1900"]]
   ],
@@ -49,19 +50,19 @@ def targets = [
   ],
   "tomcat"   : [
     [version: ["7.0.109"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
-    [version: ["8.5.72"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "8"]],
+    [version: ["8.5.72"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"], args: [majorVersion: "8"]],
     [version: ["8.5.72"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
-    [version: ["9.0.54"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "9"]],
+    [version: ["9.0.54"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"], args: [majorVersion: "9"]],
     [version: ["9.0.54"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
-    [version: ["10.0.12"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "10"], war: "servlet-5.0"],
+    [version: ["10.0.12"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"], args: [majorVersion: "10"], war: "servlet-5.0"],
     [version: ["10.0.12"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "10"], war: "servlet-5.0"]
   ],
   "tomee"    : [
     [version: ["7.0.9"], vm: ["hotspot", "openj9"], jdk: ["8"]],
     [version: ["7.1.4"], vm: ["hotspot", "openj9"], jdk: ["8"]],
-    [version: ["8.0.8"], vm: ["hotspot"], jdk: ["8", "11", "17"]],
+    [version: ["8.0.8"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"]],
     [version: ["8.0.8"], vm: ["openj9"], jdk: ["8", "11", "16"]],
-    [version: ["9.0.0-M7"], vm: ["hotspot"], jdk: ["8", "11", "17"], war: "servlet-5.0"],
+    [version: ["9.0.0-M7"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"], war: "servlet-5.0"],
     [version: ["9.0.0-M7"], vm: ["openj9"], jdk: ["8", "11", "16"], war: "servlet-5.0"]
   ],
   "websphere": [
@@ -71,7 +72,7 @@ def targets = [
   ],
   "wildfly"  : [
     [version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
-    [version: ["17.0.1.Final", "21.0.0.Final", "25.0.1.Final"], vm: ["hotspot"], jdk: ["8", "11", "17"]],
+    [version: ["17.0.1.Final", "21.0.0.Final", "25.0.1.Final"], vm: ["hotspot"], jdk: ["8", "11", "17", "18"]],
     [version: ["17.0.1.Final", "21.0.0.Final", "25.0.1.Final"], vm: ["openj9"], jdk: ["8", "11", "16"]]
   ]
 ]
@@ -125,7 +126,11 @@ def configureImage(Task parentTask, server, dockerfile, version, vm, jdk, warPro
 
   def jdkImage
   if (vm == "hotspot") {
-    jdkImage = "eclipse-temurin:${jdk}"
+    if (jdk == "18") {
+      jdkImage = "openjdk:${jdk}"
+    } else {
+      jdkImage = "eclipse-temurin:${jdk}"
+    }
   } else if (vm == "openj9") {
     jdkImage = "adoptopenjdk:${jdk}-openj9"
   } else {

diff --git a/smoke-tests/images/spring-boot/build.gradle b/smoke-tests/images/spring-boot/build.gradle
@@ -36,7 +36,7 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
 
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  from.image = "openjdk:$targetJDK"
   to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$targetJDK-$tag"
   container.ports = ["8080"]
 }