diff --git a/smoke-tests/images/early-jdk8/build.gradle.kts b/smoke-tests/images/early-jdk8/build.gradle.kts index d583cd6f53fd..bcffd705ffb1 100644 --- a/smoke-tests/images/early-jdk8/build.gradle.kts +++ b/smoke-tests/images/early-jdk8/build.gradle.kts @@ -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") } } diff --git a/smoke-tests/images/fake-backend/build.gradle.kts b/smoke-tests/images/fake-backend/build.gradle.kts index af175ed5cb0a..89f9916a037e 100644 --- a/smoke-tests/images/fake-backend/build.gradle.kts +++ b/smoke-tests/images/fake-backend/build.gradle.kts @@ -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") } } diff --git a/smoke-tests/images/grpc/build.gradle.kts b/smoke-tests/images/grpc/build.gradle.kts index f6df15edf1e0..c57cddd6b559 100644 --- a/smoke-tests/images/grpc/build.gradle.kts +++ b/smoke-tests/images/grpc/build.gradle.kts @@ -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" } diff --git a/smoke-tests/images/play/build.gradle.kts b/smoke-tests/images/play/build.gradle.kts index cd6785505053..4c6f27f8add2 100644 --- a/smoke-tests/images/play/build.gradle.kts +++ b/smoke-tests/images/play/build.gradle.kts @@ -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" } diff --git a/smoke-tests/images/quarkus/build.gradle.kts b/smoke-tests/images/quarkus/build.gradle.kts index 6d9e2508cfd9..82d6fc65e4f8 100644 --- a/smoke-tests/images/quarkus/build.gradle.kts +++ b/smoke-tests/images/quarkus/build.gradle.kts @@ -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 } diff --git a/smoke-tests/images/security-manager/build.gradle.kts b/smoke-tests/images/security-manager/build.gradle.kts index c7503573bad5..b7e73ec1e17d 100644 --- a/smoke-tests/images/security-manager/build.gradle.kts +++ b/smoke-tests/images/security-manager/build.gradle.kts @@ -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") } diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts index 674f91bc5675..fe0165d2dc0a 100644 --- a/smoke-tests/images/servlet/build.gradle.kts +++ b/smoke-tests/images/servlet/build.gradle.kts @@ -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") { diff --git a/smoke-tests/images/spring-boot/build.gradle.kts b/smoke-tests/images/spring-boot/build.gradle.kts index 2dc247e3064e..0ee7f321aa5d 100644 --- a/smoke-tests/images/spring-boot/build.gradle.kts +++ b/smoke-tests/images/spring-boot/build.gradle.kts @@ -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") }