open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support testing package publishing workflows in forks (#13153)

This commit is contained in:
Trask Stalnaker 2025-02-03 12:43:59 -08:00 committed by GitHub
parent 16a770d551
commit 551075f727
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smoke-tests/images/early-jdk8/build.gradle.kts
View File

@ -18,11 +18,13 @@ tasks {
from("Dockerfile")
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
val imageBuild by registering(DockerBuildImage::class) {
dependsOn(imagePrepare)
inputDir.set(dockerWorkingDir)
images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:$extraTag")
images.add("ghcr.io/$repo/smoke-test-zulu-openjdk-8u31:$extraTag")
dockerFile.set(dockerWorkingDir.get().file("Dockerfile"))
}
@ -30,6 +32,6 @@ tasks {
group = "publishing"
description = "Push all Docker images"
dependsOn(imageBuild)
images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:$extraTag")
images.add("ghcr.io/$repo/smoke-test-zulu-openjdk-8u31:$extraTag")
}
}

10
smoke-tests/images/fake-backend/build.gradle.kts
View File

@ -19,9 +19,11 @@ dependencies {
val extraTag = findProperty("extraTag")
?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "gcr.io/distroless/java-debian10:11"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:$extraTag"
to.image = "ghcr.io/$repo/smoke-test-fake-backend:$extraTag"
}
// windows containers are built manually since jib does not support windows containers yet
@ -53,11 +55,13 @@ tasks {
}
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
val windowsBackendImageBuild by registering(DockerBuildImage::class) {
dependsOn(windowsBackendImagePrepare)
inputDir.set(backendDockerBuildDir)
images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag")
images.add("ghcr.io/$repo/smoke-test-fake-backend-windows:$extraTag")
dockerFile.set(File(backendDockerBuildDir.get().asFile, "windows.dockerfile"))
}
@ -65,6 +69,6 @@ tasks {
group = "publishing"
description = "Push all Docker images for the test backend"
dependsOn(windowsBackendImageBuild)
images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag")
images.add("ghcr.io/$repo/smoke-test-fake-backend-windows:$extraTag")
}
}

4
smoke-tests/images/grpc/build.gradle.kts
View File

@ -36,7 +36,9 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "eclipse-temurin:$targetJDK"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$targetJDK-$tag"
to.image = "ghcr.io/$repo/smoke-test-grpc:jdk$targetJDK-$tag"
}

4
smoke-tests/images/play/build.gradle.kts
View File

@ -46,8 +46,10 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "eclipse-temurin:$targetJDK"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$targetJDK-$tag"
to.image = "ghcr.io/$repo/smoke-test-play:jdk$targetJDK-$tag"
container.mainClass = "play.core.server.ProdServerStart"
}

4
smoke-tests/images/quarkus/build.gradle.kts
View File

@ -34,9 +34,11 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "eclipse-temurin:$targetJDK"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$targetJDK-$tag"
to.image = "ghcr.io/$repo/smoke-test-quarkus:jdk$targetJDK-$tag"
container {
mainClass = "bogus" // to suppress Jib warning about missing main class
}

4
smoke-tests/images/security-manager/build.gradle.kts
View File

@ -25,9 +25,11 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "openjdk:$targetJDK"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$targetJDK-$tag"
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")
}

3
smoke-tests/images/servlet/build.gradle.kts
View File

@ -149,8 +149,9 @@ fun configureImage(
}
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
val vmSuffix = if (vm == "hotspot") "" else "-$vm"
val image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag"
val image = "ghcr.io/$repo/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag"
val jdkImage = if (vm == "hotspot") {
if (jdk == "24") {

4
smoke-tests/images/spring-boot/build.gradle.kts
View File

@ -42,9 +42,11 @@ springBoot {
}
}
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
jib {
from.image = "openjdk:$targetJDK"
to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$targetJDK-$tag"
to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"
container.ports = listOf("8080")
}