From 189388e75400c9c6ce7731b8a6c9a5a7d28d4c43 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 5 Nov 2024 09:23:14 -0800 Subject: [PATCH 1/2] Verify quarkus smoke test --- .../pr-smoke-test-quarkus-images.yml | 31 +++++++++++++++++++ smoke-tests/build.gradle.kts | 1 + .../smoketest/QuarkusSmokeTest.groovy | 4 +-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-smoke-test-quarkus-images.yml b/.github/workflows/pr-smoke-test-quarkus-images.yml index e36da5ecd82b..1e2ea6b61773 100644 --- a/.github/workflows/pr-smoke-test-quarkus-images.yml +++ b/.github/workflows/pr-smoke-test-quarkus-images.yml @@ -18,3 +18,34 @@ jobs: # Quarkus 3.7+ requires Java 17+ skip-java-8: true skip-java-11: true + + verify: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Free disk space + run: .github/scripts/gha-free-disk-space.sh + + - name: Set up JDK for running Gradle + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 + with: + distribution: temurin + java-version-file: .java-version + + - name: Set up Gradle cache + uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0 + with: + cache-read-only: true + + - name: Build Java 17 Docker image + run: ./gradlew :smoke-tests:images:quarkus:jibDockerBuild -Ptag=local -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain + + - name: Build Java 21 Docker image + run: ./gradlew :smoke-tests:images:quarkus:jibDockerBuild -Ptag=local -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain + + - name: Build Java 23 Docker image + run: ./gradlew :smoke-tests:images:quarkus:jibDockerBuild -Ptag=local -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain + + - name: Verify + run: ./gradlew :smoke-tests:test -PsmokeTestSuite=quarkus diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index a4bae35639ac..f1b99d13cd08 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -60,6 +60,7 @@ tasks { "tomee" to listOf("**/Tomee*.*"), "websphere" to listOf("**/Websphere*.*"), "wildfly" to listOf("**/Wildfly*.*"), + "quarkus" to listOf("**/Quarkus*.*"), ) val smokeTestSuite: String? by project diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy index e8d87c20c527..8c0131891195 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy @@ -19,7 +19,7 @@ import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContaine class QuarkusSmokeTest extends SmokeTest { protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$jdk-20211213.1574595137" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$jdk-local" } @Override @@ -56,6 +56,6 @@ class QuarkusSmokeTest extends SmokeTest { stopTarget() where: - jdk << [11, 17] // Quarkus 2.0+ does not support Java 8 + jdk << [17, 21, 23] // Quarkus 2.0+ does not support Java 8 } } From 44c7c617543192da622be6d5ca91e908b8d52ab2 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 5 Nov 2024 19:45:06 -0800 Subject: [PATCH 2/2] change --- .../groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy index 8c0131891195..96acaa5283b0 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy @@ -50,7 +50,7 @@ class QuarkusSmokeTest extends SmokeTest { traces.countFilteredResourceAttributes("telemetry.distro.version", currentAgentVersion) == 1 and: "service.name is detected from manifest" - traces.countFilteredResourceAttributes(ServiceAttributes.SERVICE_NAME.key, "smoke-test-quarkus-images") == 1 + traces.countFilteredResourceAttributes(ServiceAttributes.SERVICE_NAME.key, "quarkus") == 1 cleanup: stopTarget()