Update quarkus smoke test app (#12541)

open-telemetry · Nov 1, 2024 · 692e5ab · 692e5ab
1 parent 3b0e7b8
commit 692e5ab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/pr-smoke-test-quarkus-images.yml b/.github/workflows/pr-smoke-test-quarkus-images.yml
@@ -15,5 +15,6 @@ jobs:
     with:
       project: ":smoke-tests:images:quarkus"
       cache-read-only: true
-      # Quarkus 2.0+ does not support Java 8
+      # Quarkus 3.7+ requires Java 17+
       skip-java-8: true
+      skip-java-11: true
diff --git a/.github/workflows/publish-smoke-test-quarkus-images.yml b/.github/workflows/publish-smoke-test-quarkus-images.yml
@@ -15,8 +15,9 @@ jobs:
     with:
       project: ":smoke-tests:images:quarkus"
       publish: true
-      # Quarkus 2.0+ does not support Java 8
+      # Quarkus 3.7+ requires Java 17+
       skip-java-8: true
+      skip-java-11: true
 
   workflow-notification:
     needs:

diff --git a/.github/workflows/reusable-smoke-test-images.yml b/.github/workflows/reusable-smoke-test-images.yml
@@ -22,6 +22,9 @@ on:
       skip-java-8:
         type: boolean
         required: false
+      skip-java-11:
+        type: boolean
+        required: false
       skip-java-17:
         type: boolean
         required: false
@@ -70,6 +73,7 @@ jobs:
         run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 11 Docker image
+        if: "!inputs.skip-java-11"
         run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 17 Docker image

diff --git a/smoke-tests/images/quarkus/build.gradle.kts b/smoke-tests/images/quarkus/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 
 dependencies {
   implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.15.1"))
-  implementation("io.quarkus:quarkus-resteasy")
+  implementation("io.quarkus:quarkus-rest")
 }
 
 quarkus {
@@ -26,7 +26,8 @@ quarkus {
   setFinalName("opentelemetry-quarkus-$version")
 }
 
-val targetJDK = project.findProperty("targetJDK") ?: "11"
+// Quarkus 3.7+ requires Java 17+
+val targetJDK = project.findProperty("targetJDK") ?: "17"
 
 val tag = findProperty("tag")
   ?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
@@ -45,18 +46,13 @@ jib {
   container {
     mainClass = "bogus" // to suppress Jib warning about missing main class
   }
-  pluginExtensions {
-    pluginExtension {
-      implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension"
-    }
-  }
 }
 
 tasks {
   withType<JavaCompile>().configureEach {
     with(options) {
-      // Quarkus 2.0+ does not support Java 8
-      release.set(11)
+      // Quarkus 3.7+ requires Java 17+
+      release.set(17)
     }
   }
 

diff --git a/smoke-tests/images/quarkus/src/main/resources/application.properties b/smoke-tests/images/quarkus/src/main/resources/application.properties