From 3d9e0cbae7ef0063fd64700fda3b16ad6611ea1b Mon Sep 17 00:00:00 2001
From: Zhonghao Zhao <zzhlogin@amazon.com>
Date: Mon, 23 Dec 2024 11:51:19 -0800
Subject: [PATCH] Fix workflow file.

---
 .../e2e-tests-app-with-java-agent.yml         | 32 +++++++++----------
 .github/workflows/pr-build.yml                |  5 ++-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/e2e-tests-app-with-java-agent.yml b/.github/workflows/e2e-tests-app-with-java-agent.yml
index b2c4d744bf..fc1cacdae2 100644
--- a/.github/workflows/e2e-tests-app-with-java-agent.yml
+++ b/.github/workflows/e2e-tests-app-with-java-agent.yml
@@ -166,19 +166,19 @@ jobs:
           APP_IMAGE: public.ecr.aws/aws-otel-test/aws-otel-java-spark-awssdkv1:${{ inputs.image_tag }}
           VALIDATOR_COMMAND: -c spark-otel-trace-metric-validation.yml --endpoint http://app:4567 --metric-namespace aws-otel-integ-test -t ${{ github.run_id }}-${{ github.run_number }}
 
-  # publish status
-  publish-build-status:
-    needs: [ test_Spring_App_With_Java_Agent, test_Spark_App_With_Java_Agent, test_Spark_AWS_SDK_V1_App_With_Java_Agent ]
-    if: ${{ always() }}
-    uses: ./.github/workflows/publish-status.yml
-    with:
-      namespace: 'ADOT/GitHubActions'
-      repository: ${{ github.repository }}
-      branch: ${{ github.ref_name }}
-      workflow: ${{ inputs.caller-workflow-name }}
-      success: ${{  needs.test_Spring_App_With_Java_Agent.result == 'success'  &&
-                    needs.test_Spark_App_With_Java_Agent.result == 'success'  &&
-                    needs.test_Spark_AWS_SDK_V1_App_With_Java_Agent.result == 'success' }}
-      region: us-east-1
-    secrets:
-      roleArn: ${{ secrets.METRICS_ROLE_ARN }}
+#  # publish status
+#  publish-build-status:
+#    needs: [ test_Spring_App_With_Java_Agent, test_Spark_App_With_Java_Agent, test_Spark_AWS_SDK_V1_App_With_Java_Agent ]
+#    if: ${{ always() }}
+#    uses: ./.github/workflows/publish-status.yml
+#    with:
+#      namespace: 'ADOT/GitHubActions'
+#      repository: ${{ github.repository }}
+#      branch: ${{ github.ref_name }}
+#      workflow: ${{ inputs.caller-workflow-name }}
+#      success: ${{  needs.test_Spring_App_With_Java_Agent.result == 'success'  &&
+#                    needs.test_Spark_App_With_Java_Agent.result == 'success'  &&
+#                    needs.test_Spark_AWS_SDK_V1_App_With_Java_Agent.result == 'success' }}
+#      region: us-east-1
+#    secrets:
+#      roleArn: ${{ secrets.METRICS_ROLE_ARN }}
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 89dc901f13..8a31b99ae9 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -88,12 +88,11 @@ jobs:
         with:
           arguments: build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
 
-      - e2e-test:
-        needs: [ build, default-region-output ]
+      - name: e2e-test
         uses: ./.github/workflows/e2e-tests-app-with-java-agent.yml
         secrets: inherit
         with:
-          aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}
+          aws-region: 'us-east-1'
           image_tag: ${{ github.sha }}
           caller-workflow-name: 'main-build'