From 57410cd07c747d653258b9a83e0cfc241217d089 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 17 Sep 2021 03:12:53 -0700 Subject: [PATCH] Use repo-scoped ghcr packages (#4149) --- smoke-tests/fake-backend/build.gradle | 4 ++-- smoke-tests/grpc/build.gradle | 2 +- smoke-tests/play/build.gradle | 2 +- smoke-tests/springboot/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/smoke-tests/fake-backend/build.gradle b/smoke-tests/fake-backend/build.gradle index f44debefed..872d111ae1 100644 --- a/smoke-tests/fake-backend/build.gradle +++ b/smoke-tests/fake-backend/build.gradle @@ -38,7 +38,7 @@ ext { jib { from.image = "gcr.io/distroless/java-debian10:11" - to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-$extraTag" + to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:$extraTag" } @@ -58,7 +58,7 @@ task windowsBackendImageBuild(type: DockerBuildImage) { dependsOn(windowsBackendImagePrepare) inputDir = backendDockerBuildDir - it.images.add "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-windows-$extraTag" + it.images.add "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag" it.dockerFile = new File(backendDockerBuildDir, "windows.dockerfile") } diff --git a/smoke-tests/grpc/build.gradle b/smoke-tests/grpc/build.gradle index 88cff817da..c92e99d200 100644 --- a/smoke-tests/grpc/build.gradle +++ b/smoke-tests/grpc/build.gradle @@ -43,5 +43,5 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS") jib { from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK" - to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$targetJDK-$tag" + to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$targetJDK-$tag" } diff --git a/smoke-tests/play/build.gradle b/smoke-tests/play/build.gradle index 8364f65c02..22d556a255 100644 --- a/smoke-tests/play/build.gradle +++ b/smoke-tests/play/build.gradle @@ -40,6 +40,6 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS") jib { from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK" - to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$targetJDK-$tag" + to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$targetJDK-$tag" container.mainClass = "play.core.server.ProdServerStart" } \ No newline at end of file diff --git a/smoke-tests/springboot/build.gradle b/smoke-tests/springboot/build.gradle index 99b9fcb21c..836d082edd 100644 --- a/smoke-tests/springboot/build.gradle +++ b/smoke-tests/springboot/build.gradle @@ -37,6 +37,6 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS") jib { from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK" - to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$targetJDK-$tag" + to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-springboot:jdk$targetJDK-$tag" container.ports = ["8080"] } \ No newline at end of file