Skip to content

Commit b6cb7fc

Browse files
committed
Support running in forks
1 parent 57b8888 commit b6cb7fc

File tree

8 files changed

+28
-11
lines changed

8 files changed

+28
-11
lines changed

smoke-tests/images/early-jdk8/build.gradle.kts

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,20 @@ tasks {
1818
from("Dockerfile")
1919
}
2020

21+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
22+
2123
val imageBuild by registering(DockerBuildImage::class) {
2224
dependsOn(imagePrepare)
2325
inputDir.set(dockerWorkingDir)
2426

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")
2628
dockerFile.set(dockerWorkingDir.get().file("Dockerfile"))
2729
}
2830

2931
val dockerPush by registering(DockerPushImage::class) {
3032
group = "publishing"
3133
description = "Push all Docker images"
3234
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")
3436
}
3537
}

smoke-tests/images/fake-backend/build.gradle.kts

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ dependencies {
1919
val extraTag = findProperty("extraTag")
2020
?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
2121

22+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
23+
2224
jib {
2325
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"
2527
}
2628

2729
// windows containers are built manually since jib does not support windows containers yet
@@ -53,18 +55,20 @@ tasks {
5355
}
5456
}
5557

58+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
59+
5660
val windowsBackendImageBuild by registering(DockerBuildImage::class) {
5761
dependsOn(windowsBackendImagePrepare)
5862
inputDir.set(backendDockerBuildDir)
5963

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")
6165
dockerFile.set(File(backendDockerBuildDir.get().asFile, "windows.dockerfile"))
6266
}
6367

6468
val dockerPush by registering(DockerPushImage::class) {
6569
group = "publishing"
6670
description = "Push all Docker images for the test backend"
6771
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")
6973
}
7074
}

smoke-tests/images/grpc/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ java {
3636
targetCompatibility = JavaVersion.VERSION_1_8
3737
}
3838

39+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
40+
3941
jib {
4042
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"
4244
}

smoke-tests/images/play/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ java {
4646
targetCompatibility = JavaVersion.VERSION_1_8
4747
}
4848

49+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
50+
4951
jib {
5052
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"
5254
container.mainClass = "play.core.server.ProdServerStart"
5355
}

smoke-tests/images/quarkus/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ java {
3434
targetCompatibility = JavaVersion.VERSION_17
3535
}
3636

37+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
38+
3739
jib {
3840
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"
4042
container {
4143
mainClass = "bogus" // to suppress Jib warning about missing main class
4244
}

smoke-tests/images/security-manager/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ java {
2525
targetCompatibility = JavaVersion.VERSION_1_8
2626
}
2727

28+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
29+
2830
jib {
2931
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"
3133
container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"
3234
container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")
3335
}

smoke-tests/images/servlet/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@ fun configureImage(
149149
}
150150
}
151151

152+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
152153
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"
154155

155156
val jdkImage = if (vm == "hotspot") {
156157
if (jdk == "24") {

smoke-tests/images/spring-boot/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ springBoot {
4242
}
4343
}
4444

45+
val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
46+
4547
jib {
4648
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"
4850
container.ports = listOf("8080")
4951
}
5052

0 commit comments

Comments
 (0)