Skip to content

Commit 4a210cf

Browse files
authored
Fix cache configuration error for jib (#15460)
1 parent c41199b commit 4a210cf

File tree

6 files changed

+38
-0
lines changed

6 files changed

+38
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
22
import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
3+
import com.google.cloud.tools.jib.gradle.JibTask
34
import java.time.LocalDateTime
45
import java.time.format.DateTimeFormatter
56

@@ -48,6 +49,11 @@ tasks {
4849
}
4950
}
5051

52+
withType<JibTask>().configureEach {
53+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
54+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
55+
}
56+
5157
javadoc {
5258
isEnabled = false
5359
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.google.cloud.tools.jib.gradle.JibTask
12
import java.time.LocalDateTime
23
import java.time.format.DateTimeFormatter
34

@@ -42,3 +43,10 @@ jib {
4243
from.image = "eclipse-temurin:$targetJDK"
4344
to.image = "ghcr.io/$repo/smoke-test-grpc:jdk$targetJDK-$tag"
4445
}
46+
47+
tasks {
48+
withType<JibTask>().configureEach {
49+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
50+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
51+
}
52+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.google.cloud.tools.jib.gradle.JibTask
12
import org.gradle.jvm.toolchain.JavaLanguageVersion
23
import play.gradle.Language
34
import java.time.LocalDateTime
@@ -44,3 +45,10 @@ jib {
4445
to.image = "ghcr.io/$repo/smoke-test-play:jdk$targetJDK-$tag"
4546
container.mainClass = "play.core.server.ProdServerStart"
4647
}
48+
49+
tasks {
50+
withType<JibTask>().configureEach {
51+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
52+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
53+
}
54+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ tasks {
6565

6666
withType<JibTask>().configureEach {
6767
dependsOn(quarkusBuild)
68+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
69+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
6870
}
6971

7072
compileJava {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.google.cloud.tools.jib.gradle.JibTask
12
import java.time.LocalDateTime
23
import java.time.format.DateTimeFormatter
34

@@ -33,3 +34,10 @@ jib {
3334
container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"
3435
container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")
3536
}
37+
38+
tasks {
39+
withType<JibTask>().configureEach {
40+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
41+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
42+
}
43+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.google.cloud.tools.jib.gradle.JibTask
12
import java.time.LocalDateTime
23
import java.time.format.DateTimeFormatter
34

@@ -63,6 +64,11 @@ jib {
6364
}
6465

6566
tasks {
67+
withType<JibTask>().configureEach {
68+
// Jib tasks access Task.project at execution time which is not compatible with configuration cache
69+
notCompatibleWithConfigurationCache("Jib task accesses Task.project at execution time")
70+
}
71+
6672
val springBootJar by configurations.creating {
6773
isCanBeConsumed = true
6874
isCanBeResolved = false

0 commit comments

Comments
 (0)