Branch out smoke test ECR images.

Author: zzhlogin

otelagent/build.gradle.kts

@@ -138,7 +138,7 @@ tasks {
 jib {
   configureImages(
     "gcr.io/distroless/java17-debian11:debug",
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha-v2",
     localDocker = false,
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
   )

sample-apps/spark-awssdkv1/build.gradle.kts

@@ -22,8 +22,8 @@ application {
 
 jib {
   configureImages(
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark-awssdkv1",
+    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha-v2",
+    "public.ecr.aws/aws-otel-test/aws-otel-java-spark-awssdkv1:v2",
     localDocker = rootProject.property("localDocker")!!.equals("true"),
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

sample-apps/spark/build.gradle.kts

@@ -28,8 +28,8 @@ application {
 jib {
 
   configureImages(
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark",
+    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha-v2",
+    "public.ecr.aws/aws-otel-test/aws-otel-java-spark:v2",
     localDocker = rootProject.property("localDocker")!!.equals("true"),
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

sample-apps/springboot/build.gradle.kts

@@ -17,8 +17,8 @@ dependencies {
 
 jib {
   configureImages(
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-springboot",
+    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha-v2",
+    "public.ecr.aws/aws-otel-test/aws-otel-java-springboot:v2",
     rootProject.property("localDocker")!!.equals("true"),
     !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

smoke-tests/fakebackend/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 
 jib {
   to {
-    image = "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-test-fakebackend:alpha"
+    image = "public.ecr.aws/aws-otel-test/aws-otel-java-test-fakebackend:alpha-v2"
   }
   from {
     image = "gcr.io/distroless/java17-debian11:debug"

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java

@@ -98,8 +98,7 @@ public ExportTraceServiceRequest deserialize(
 
   @Container
   private static final GenericContainer<?> backend =
-      new GenericContainer<>(
-              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-test-fakebackend:alpha")
+      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-test-fakebackend:alpha-v2")
           .withExposedPorts(8080)
           .waitingFor(Wait.forHttp("/health").forPort(8080))
           .withLogConsumer(new Slf4jLogConsumer(backendLogger))
@@ -108,8 +107,7 @@ public ExportTraceServiceRequest deserialize(
 
   @Container
   private static final GenericContainer<?> application =
-      new GenericContainer<>(
-              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
+      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:v2")
           .dependsOn(backend)
           .withExposedPorts(8080)
           .withNetwork(network)
@@ -128,8 +126,7 @@ public ExportTraceServiceRequest deserialize(
   // https://opentelemetry.io/docs/zero-code/java/agent/disable/#suppressing-controller-andor-view-spans
   @Container
   private static final GenericContainer<?> applicationXraySampler =
-      new GenericContainer<>(
-              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
+      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:v2")
           .dependsOn(backend)
           .withExposedPorts(8080)
           .withNetwork(network)

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

@@ -47,8 +47,8 @@ dependencies {
 
 jib {
   configureImages(
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot",
+    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha-v2",
+    "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:v2",
     localDocker = rootProject.property("localDocker")!!.equals("true"),
     multiPlatform = false,
   )