Skip to content

Commit 80a5564

Browse files
committed
Fix and test quarkus image
1 parent 2fc4c77 commit 80a5564

File tree

3 files changed

+36
-1
lines changed

3 files changed

+36
-1
lines changed

.github/workflows/pr-smoke-test-quarkus-images.yml

+27
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,38 @@ on:
1010
- main
1111

1212
jobs:
13+
generate-tag:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Set tag
17+
run: |
18+
echo "::set-output name=tag::$(date '+%Y%m%d').$GITHUB_RUN_ID"
19+
1320
build:
1421
uses: ./.github/workflows/reusable-smoke-test-images.yml
1522
with:
1623
project: ":smoke-tests:images:quarkus"
24+
tag: ${{ needs.generate-tag.outputs.tag }}
1725
cache-read-only: true
1826
# Quarkus 3.7+ requires Java 17+
1927
skip-java-8: true
2028
skip-java-11: true
29+
30+
verify:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
35+
- name: Set up Gradle cache
36+
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
37+
with:
38+
cache-read-only: true
39+
40+
- name: Build Java 21 Docker image
41+
run: ./gradlew :smoke-tests:images:quarkus:jibDockerBuild -Ptag=local -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain
42+
43+
- name: Build Java 23 Docker image
44+
run: ./gradlew :smoke-tests:images:quarkus:jibDockerBuild -Ptag=local -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain
45+
46+
- name: Verify
47+
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=other -Dtag=local

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

+5
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ jib {
4646
container {
4747
mainClass = "bogus" // to suppress Jib warning about missing main class
4848
}
49+
pluginExtensions {
50+
pluginExtension {
51+
implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension"
52+
}
53+
}
4954
}
5055

5156
tasks {

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContaine
1818
@IgnoreIf({ useWindowsContainers() })
1919
class QuarkusSmokeTest extends SmokeTest {
2020

21+
private static final TAG = System.getProperty("tag", "20211213.1574595137")
22+
2123
protected String getTargetImage(String jdk) {
22-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$jdk-20211213.1574595137"
24+
println "HERE TRASK HERE: ${TAG}"
25+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$jdk-$TAG"
2326
}
2427

2528
@Override

0 commit comments

Comments
 (0)