Skip to content

Commit eac2299

Browse files
authored
Update Application Signals E2E ing to retrieve workflow file from fra… (#224)
*Issue #, if available:* The release testing workflow relies on resources from the framework repository, and when there are changes in the repo, the workflows become out of sync. *Description of changes:* Updating the release testing workflow to retrieve the workflow yml from framework repository. Test run: https://github.com/aws-observability/aws-otel-python-instrumentation/actions/runs/9864587752 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
1 parent 9f4655a commit eac2299

File tree

2 files changed

+88
-18
lines changed

2 files changed

+88
-18
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
# This is a reusable workflow for running the E2E test for Application Signals.
5+
# It is meant to be called from another workflow.
6+
# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview
7+
name: E2E Testing
8+
on:
9+
workflow_call:
10+
inputs:
11+
staging-wheel-name:
12+
required: true
13+
type: string
14+
adot-image-name:
15+
required: true
16+
type: string
17+
18+
permissions:
19+
id-token: write
20+
contents: read
21+
22+
concurrency:
23+
group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
24+
cancel-in-progress: false
25+
26+
27+
jobs:
28+
upload-main-build:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Configure AWS Credentials
32+
uses: aws-actions/configure-aws-credentials@v4
33+
with:
34+
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
35+
aws-region: us-east-1
36+
37+
- uses: actions/download-artifact@v3
38+
with:
39+
name: ${{ inputs.staging-wheel-name }}
40+
41+
- name: Upload main-build adot.whl to s3
42+
run: aws s3 cp ${{ inputs.staging-wheel-name }} s3://adot-main-build-staging-jar/${{ inputs.staging-wheel-name }}
43+
44+
python-ec2-default-e2e-test:
45+
needs: [ upload-main-build ]
46+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-e2e-test.yml@consolidate-release
47+
secrets: inherit
48+
with:
49+
aws-region: us-east-1
50+
staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
51+
caller-workflow-name: 'main-build'
52+
53+
python-ec2-asg-e2e-test:
54+
needs: [ upload-main-build ]
55+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-e2e-test.yml@consolidate-release
56+
secrets: inherit
57+
with:
58+
aws-region: us-east-1
59+
staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
60+
caller-workflow-name: 'main-build'
61+
62+
python-eks-e2e-test:
63+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-e2e-test.yml@consolidate-release
64+
secrets: inherit
65+
with:
66+
aws-region: us-east-1
67+
test-cluster-name: 'e2e-python-adot-test'
68+
adot-image-name: ${{ inputs.adot-image-name }}
69+
caller-workflow-name: 'main-build'
70+
71+
python-k8s-e2e-test:
72+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-e2e-test.yml@consolidate-release
73+
secrets: inherit
74+
with:
75+
aws-region: us-east-1
76+
adot-image-name: ${{ inputs.adot-image-name }}
77+
caller-workflow-name: 'main-build'
78+
79+
80+

.github/workflows/main_build.yml

+8-18
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,14 @@ jobs:
8787
pip install pytest
8888
pytest contract-tests/tests
8989
90-
# Application Signals specific e2e eks tests
91-
application-signals-python-e2e-eks-test:
92-
needs: [build]
93-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/application-signals-python-e2e-eks-test.yml@main
94-
secrets: inherit
95-
with:
96-
aws-region: ${{ needs.build.outputs.aws_default_region }}
97-
test-cluster-name: e2e-python-adot-test
98-
caller-workflow-name: 'main-build'
99-
application-signals-adot-image: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-python-staging
100-
application-signals-adot-image-tag: ${{ needs.build.outputs.python_image_tag }}
101-
102-
# Application Signals specific e2e tests for ec2
103-
application-signals-python-e2e-ec2-test:
90+
application-signals-e2e-test:
91+
name: "Application Signals E2E Test"
10492
needs: [ build ]
105-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/application-signals-python-e2e-ec2-default-test.yml@main
93+
uses: ./.github/workflows/application-signals-e2e-test.yml
10694
secrets: inherit
95+
permissions:
96+
id-token: write
97+
contents: read
10798
with:
108-
aws-region: ${{ needs.build.outputs.aws_default_region }}
109-
staging_wheel_name: ${{ needs.build.outputs.staging_wheel_file }}
110-
caller-workflow-name: 'main-build'
99+
staging-wheel-name: ${{ needs.build.outputs.staging_wheel_file }}
100+
adot-image-name: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-python-staging:${{ needs.build.outputs.python_image_tag }}

0 commit comments

Comments
 (0)