Skip to content

Use temurin in spring boot smoke test images #15033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2025
+17 −5
Merged

Use temurin in spring boot smoke test images #15033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ab406
Use temurin in spring boot smoke test images
laurit Oct 17, 2025
63b2ed3
security manager test too
laurit Oct 17, 2025
f901cfe
set targetCompatibility
laurit Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion smoke-tests/images/security-manager/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 7 additions & 1 deletion smoke-tests/images/spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand All @@ -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")
}
Expand Down
4 changes: 3 additions & 1 deletion smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 3 additions & 1 deletion smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 3 additions & 1 deletion smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading