Fix jib build error in contract tests (#599)

aws-observability · Nov 15, 2023 · 5180afe · 5180afe
1 parent 862695e
commit 5180afe
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 4 deletions.
diff --git a/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts b/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts
@@ -40,7 +40,11 @@ java {
   sourceCompatibility = JavaVersion.VERSION_11
   targetCompatibility = JavaVersion.VERSION_11
 }
-
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts b/appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts
@@ -40,7 +40,11 @@ java {
   sourceCompatibility = JavaVersion.VERSION_11
   targetCompatibility = JavaVersion.VERSION_11
 }
-
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/grpc/grpc-client/build.gradle.kts b/appsignals-tests/images/grpc/grpc-client/build.gradle.kts
@@ -38,7 +38,11 @@ dependencies {
 
   runtimeOnly("io.grpc:grpc-netty-shaded")
 }
-
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/grpc/grpc-server/build.gradle.kts b/appsignals-tests/images/grpc/grpc-server/build.gradle.kts
@@ -43,7 +43,11 @@ dependencies {
 application {
   mainClass.set("software.amazon.opentelemetry.EchoerServer")
 }
-
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-clients/apache-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/apache-http-client/build.gradle.kts
@@ -36,6 +36,11 @@ java {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-clients/native-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/native-http-client/build.gradle.kts
@@ -35,6 +35,11 @@ java {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-clients/netty-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/netty-http-client/build.gradle.kts
@@ -36,6 +36,11 @@ java {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-clients/spring-mvc-client/build.gradle.kts b/appsignals-tests/images/http-clients/spring-mvc-client/build.gradle.kts
@@ -32,6 +32,11 @@ dependencies {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-servers/netty-server/build.gradle.kts b/appsignals-tests/images/http-servers/netty-server/build.gradle.kts
@@ -38,6 +38,11 @@ repositories {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-servers/spring-mvc/build.gradle.kts b/appsignals-tests/images/http-servers/spring-mvc/build.gradle.kts
@@ -34,6 +34,11 @@ dependencies {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/http-servers/tomcat/build.gradle.kts b/appsignals-tests/images/http-servers/tomcat/build.gradle.kts
@@ -37,6 +37,11 @@ dependencies {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/jdbc/build.gradle.kts b/appsignals-tests/images/jdbc/build.gradle.kts
@@ -35,6 +35,11 @@ dependencies {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/kafka/kafka-consumers/build.gradle.kts b/appsignals-tests/images/kafka/kafka-consumers/build.gradle.kts
@@ -44,6 +44,11 @@ tasks.getByName<Test>("test") {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/kafka/kafka-producers/build.gradle.kts b/appsignals-tests/images/kafka/kafka-producers/build.gradle.kts
@@ -44,6 +44,11 @@ tasks.getByName<Test>("test") {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",

diff --git a/appsignals-tests/images/mock-collector/build.gradle.kts b/appsignals-tests/images/mock-collector/build.gradle.kts
@@ -35,6 +35,11 @@ dependencies {
 
 // not publishing images to hubs in this configuration - local build only through jibDockerBuild
 // if localDocker property is set to true then the image will only be pulled from Docker Daemon
+tasks {
+  named("jib") {
+    enabled = false
+  }
+}
 jib {
   configureImages(
     "public.ecr.aws/docker/library/amazoncorretto:17-alpine",