From 8f01cfe69051440dc4a81eb089831d23823ceeb9 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 14:56:39 -0700 Subject: [PATCH 1/7] fix e2e test to work in release branches --- .github/workflows/application-signals-e2e-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml index ca152b37b0..61f0d4223c 100644 --- a/.github/workflows/application-signals-e2e-test.yml +++ b/.github/workflows/application-signals-e2e-test.yml @@ -36,7 +36,7 @@ jobs: name: aws-opentelemetry-agent.jar - name: Upload main-build adot.jar to s3 - run: aws s3 cp ./aws-opentelemetry-agent-*-SNAPSHOT.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar + run: aws s3 cp ./aws-opentelemetry-agent-*.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar # # PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE From c631848a5a5cb6917be8ba3cb53ce468a8cdb8d4 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 16:17:59 -0700 Subject: [PATCH 2/7] match exact artifact name --- .github/workflows/application-signals-e2e-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml index 61f0d4223c..75b07109d4 100644 --- a/.github/workflows/application-signals-e2e-test.yml +++ b/.github/workflows/application-signals-e2e-test.yml @@ -36,7 +36,10 @@ jobs: name: aws-opentelemetry-agent.jar - name: Upload main-build adot.jar to s3 - run: aws s3 cp ./aws-opentelemetry-agent-*.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar + run: | + # Extract artifact suffix using version.gradle.kts + VERSION=$(awk -F'"' '/val adotVersion = / {print $2}' version.gradle.kts) + aws s3 cp ./aws-opentelemetry-agent-$VERSION.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar # # PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE From ffc0984862a979c73753da031c7dc73021fc95f8 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 16:18:33 -0700 Subject: [PATCH 3/7] add main build trigger for testing --- .github/workflows/main-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 622cba16e3..759a2057d3 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -4,6 +4,7 @@ on: branches: - main - "release/v*" + - "fix-e2e-test" workflow_dispatch: # be able to run the workflow on demand env: AWS_DEFAULT_REGION: us-east-1 From ec3ad165bf7b5f70713513943685e6f16e9dda46 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 17:16:21 -0700 Subject: [PATCH 4/7] add checkout step to read version file --- .github/workflows/application-signals-e2e-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml index 75b07109d4..cda50cd13c 100644 --- a/.github/workflows/application-signals-e2e-test.yml +++ b/.github/workflows/application-signals-e2e-test.yml @@ -25,6 +25,8 @@ jobs: upload-main-build: runs-on: ubuntu-latest steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0 + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0 with: From 49f2ce107022baeb77705582e4f3d437b7435790 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 18:29:28 -0700 Subject: [PATCH 5/7] test remove SNAPSHOT --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 02c4204c54..47653c919e 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -val adotVersion = "2.20.0-SNAPSHOT" +val adotVersion = "2.20.0" allprojects { version = if (project.hasProperty("release.version")) { From 0a7bb6d72ba584278f8902d1e962a3e2853ebdbd Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 18:31:57 -0700 Subject: [PATCH 6/7] Revert "add main build trigger for testing" This reverts commit ffc0984862a979c73753da031c7dc73021fc95f8. --- .github/workflows/main-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 759a2057d3..622cba16e3 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -4,7 +4,6 @@ on: branches: - main - "release/v*" - - "fix-e2e-test" workflow_dispatch: # be able to run the workflow on demand env: AWS_DEFAULT_REGION: us-east-1 From e1b1de88f6dd9b8248fa17055913d1a433968c87 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 29 Oct 2025 18:37:39 -0700 Subject: [PATCH 7/7] Revert "test remove SNAPSHOT" This reverts commit 49f2ce107022baeb77705582e4f3d437b7435790. --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 47653c919e..02c4204c54 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -val adotVersion = "2.20.0" +val adotVersion = "2.20.0-SNAPSHOT" allprojects { version = if (project.hasProperty("release.version")) {