Support testing package publishing workflows in forks (#13153)

trask · web-flow · commit 551075f7276f · 2025-02-03T12:43:59.000-08:00
diff --git a/smoke-tests/images/early-jdk8/build.gradle.kts b/smoke-tests/images/early-jdk8/build.gradle.kts
@@ -18,18 +18,20 @@ 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"))
   }
 
   val dockerPush by registering(DockerPushImage::class) {
     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
@@ -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,18 +55,20 @@ 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"))
   }
 
   val dockerPush by registering(DockerPushImage::class) {
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,18 +18,20 @@ tasks {`
`18`	`18`	`from("Dockerfile")`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`22`	`+`
`21`	`23`	`val imageBuild by registering(DockerBuildImage::class) {`
`22`	`24`	`dependsOn(imagePrepare)`
`23`	`25`	`inputDir.set(dockerWorkingDir)`
`24`	`26`
`25`		`- images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:$extraTag")`
	`27`	`+ images.add("ghcr.io/$repo/smoke-test-zulu-openjdk-8u31:$extraTag")`
`26`	`28`	`dockerFile.set(dockerWorkingDir.get().file("Dockerfile"))`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`val dockerPush by registering(DockerPushImage::class) {`
`30`	`32`	`group = "publishing"`
`31`	`33`	`description = "Push all Docker images"`
`32`	`34`	`dependsOn(imageBuild)`
`33`		`- images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:$extraTag")`
	`35`	`+ images.add("ghcr.io/$repo/smoke-test-zulu-openjdk-8u31:$extraTag")`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,11 @@ dependencies {`
`19`	`19`	`val extraTag = findProperty("extraTag")`
`20`	`20`	`?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())`
`21`	`21`
	`22`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`23`	`+`
`22`	`24`	`jib {`
`23`	`25`	`from.image = "gcr.io/distroless/java-debian10:11"`
`24`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:$extraTag"`
	`26`	`+ to.image = "ghcr.io/$repo/smoke-test-fake-backend:$extraTag"`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`// windows containers are built manually since jib does not support windows containers yet`
`@@ -53,18 +55,20 @@ tasks {`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`
	`58`	`+ val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`59`	`+`
`56`	`60`	`val windowsBackendImageBuild by registering(DockerBuildImage::class) {`
`57`	`61`	`dependsOn(windowsBackendImagePrepare)`
`58`	`62`	`inputDir.set(backendDockerBuildDir)`
`59`	`63`
`60`		`- images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag")`
	`64`	`+ images.add("ghcr.io/$repo/smoke-test-fake-backend-windows:$extraTag")`
`61`	`65`	`dockerFile.set(File(backendDockerBuildDir.get().asFile, "windows.dockerfile"))`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`val dockerPush by registering(DockerPushImage::class) {`
`65`	`69`	`group = "publishing"`
`66`	`70`	`description = "Push all Docker images for the test backend"`
`67`	`71`	`dependsOn(windowsBackendImageBuild)`
`68`		`- images.add("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag")`
	`72`	`+ images.add("ghcr.io/$repo/smoke-test-fake-backend-windows:$extraTag")`
`69`	`73`	`}`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ java {`
`36`	`36`	`targetCompatibility = JavaVersion.VERSION_1_8`
`37`	`37`	`}`
`38`	`38`
	`39`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`40`	`+`
`39`	`41`	`jib {`
`40`	`42`	`from.image = "eclipse-temurin:$targetJDK"`
`41`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$targetJDK-$tag"`
	`43`	`+ to.image = "ghcr.io/$repo/smoke-test-grpc:jdk$targetJDK-$tag"`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,10 @@ java {`
`46`	`46`	`targetCompatibility = JavaVersion.VERSION_1_8`
`47`	`47`	`}`
`48`	`48`
	`49`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`50`	`+`
`49`	`51`	`jib {`
`50`	`52`	`from.image = "eclipse-temurin:$targetJDK"`
`51`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$targetJDK-$tag"`
	`53`	`+ to.image = "ghcr.io/$repo/smoke-test-play:jdk$targetJDK-$tag"`
`52`	`54`	`container.mainClass = "play.core.server.ProdServerStart"`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@ java {`
`34`	`34`	`targetCompatibility = JavaVersion.VERSION_17`
`35`	`35`	`}`
`36`	`36`
	`37`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`38`	`+`
`37`	`39`	`jib {`
`38`	`40`	`from.image = "eclipse-temurin:$targetJDK"`
`39`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk$targetJDK-$tag"`
	`41`	`+ to.image = "ghcr.io/$repo/smoke-test-quarkus:jdk$targetJDK-$tag"`
`40`	`42`	`container {`
`41`	`43`	`mainClass = "bogus" // to suppress Jib warning about missing main class`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,11 @@ java {`
`25`	`25`	`targetCompatibility = JavaVersion.VERSION_1_8`
`26`	`26`	`}`
`27`	`27`
	`28`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`29`	`+`
`28`	`30`	`jib {`
`29`	`31`	`from.image = "openjdk:$targetJDK"`
`30`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$targetJDK-$tag"`
	`32`	`+ to.image = "ghcr.io/$repo/smoke-test-security-manager:jdk$targetJDK-$tag"`
`31`	`33`	`container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"`
`32`	`34`	`container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,9 @@ fun configureImage(`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
`152`	`153`	`val vmSuffix = if (vm == "hotspot") "" else "-$vm"`
`153`		`- val image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag"`
	`154`	`+ val image = "ghcr.io/$repo/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag"`
`154`	`155`
`155`	`156`	`val jdkImage = if (vm == "hotspot") {`
`156`	`157`	`if (jdk == "24") {`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,11 @@ springBoot {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
	`46`	`+`
`45`	`47`	`jib {`
`46`	`48`	`from.image = "openjdk:$targetJDK"`
`47`		`- to.image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$targetJDK-$tag"`
	`49`	`+ to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"`
`48`	`50`	`container.ports = listOf("8080")`
`49`	`51`	`}`
`50`	`52`