Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix jib build error in Contract Tests #599

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Fix jib build error in Contract Tests #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b4947f
Fix jib build error in contract tests
PaurushGarg Nov 15, 2023
e36a0db
Merge branch 'release/v1.31.x' into fix_release_error
PaurushGarg Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion appsignals-tests/images/grpc/grpc-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion appsignals-tests/images/grpc/grpc-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-clients/apache-http-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-clients/native-http-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-clients/netty-http-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-clients/spring-mvc-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-servers/netty-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-servers/spring-mvc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/http-servers/tomcat/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/jdbc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/kafka/kafka-consumers/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/kafka/kafka-producers/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions appsignals-tests/images/mock-collector/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down