From f83cb9d294ef9fb364cb750ebb2174dbf229f8c9 Mon Sep 17 00:00:00 2001
From: zzhlogin <zzhlogin@amazon.com>
Date: Wed, 18 Sep 2024 11:05:20 -0700
Subject: [PATCH] Add ECS E2E test into main build (#890)

This PR do the following two things:
1. Fix [recent main build
failure](https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/10926150649/job/30330248240)
by updating Dockerfile syntax.

2. Add ECS E2E test entry point into main build.

An example of succeed test workflow:

https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/10926900740
(E2E operator test failure is expected, will plan on the effort fixing
it).

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
---
 .github/workflows/application-signals-e2e-test.yml | 8 ++++++++
 Dockerfile                                         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml
index 68f1330ca..f5f9734d6 100644
--- a/.github/workflows/application-signals-e2e-test.yml
+++ b/.github/workflows/application-signals-e2e-test.yml
@@ -76,6 +76,14 @@ jobs:
   java-k8s-e2e-test:
     uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
     secrets: inherit
+    with:
+      aws-region: us-east-1
+      adot-image-name: ${{ inputs.adot-image-name }}
+      caller-workflow-name: 'main-build'
+
+  java-ecs-e2e-test:
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
+    secrets: inherit
     with:
       aws-region: us-east-1
       adot-image-name: ${{ inputs.adot-image-name }}
diff --git a/Dockerfile b/Dockerfile
index eb4d7476e..8a0d81dbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,4 +51,4 @@ ARG ADOT_JAVA_VERSION
 COPY --from=builder /usr/src/cp-utility/bin/cp-utility /bin/cp
 
 
-COPY --chmod=go+r ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar  /javaagent.jar
+COPY --chmod=0644 ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar  /javaagent.jar