Skip to content

Commit

Permalink
Fix workflow file.
Browse files Browse the repository at this point in the history
  • Loading branch information
zzhlogin committed Dec 23, 2024
1 parent 3d44a8d commit 3d9e0cb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/e2e-tests-app-with-java-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
5 changes: 2 additions & 3 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down

0 comments on commit 3d9e0cb

Please sign in to comment.