Skip to content

Commit 4cdc78f

Browse files
Add Application Signals E2E test to main build (#76)
1 parent a600740 commit 4cdc78f

File tree

2 files changed

+88
-13
lines changed

2 files changed

+88
-13
lines changed
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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-instrumentation-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::637423224110:role/${{ secrets.STAGING_ARTIFACTS_ACCESS_ROLE_NAME }}
35+
aws-region: us-east-1
36+
37+
- uses: actions/download-artifact@v3
38+
with:
39+
name: ${{ inputs.staging-instrumentation-name }}
40+
41+
- name: Upload main-build instrumentation to S3
42+
run: aws s3 cp ${{ inputs.staging-instrumentation-name }} s3://adot-autoinstrumentation-node-staging/${{ inputs.staging-instrumentation-name }}
43+
44+
ec2-default:
45+
needs: [ upload-main-build ]
46+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ec2-default-test.yml@main
47+
secrets: inherit
48+
with:
49+
aws-region: us-east-1
50+
staging-instrumentation-name: ${{ inputs.staging-instrumentation-name }}
51+
caller-workflow-name: 'main-build'
52+
53+
ec2-asg:
54+
needs: [ upload-main-build ]
55+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ec2-asg-test.yml@main
56+
secrets: inherit
57+
with:
58+
aws-region: us-east-1
59+
staging-instrumentation-name: ${{ inputs.staging-instrumentation-name }}
60+
caller-workflow-name: 'main-build'
61+
62+
eks:
63+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-eks-test.yml@main
64+
secrets: inherit
65+
with:
66+
aws-region: us-east-1
67+
test-cluster-name: 'e2e-node-adot-test'
68+
adot-image-name: ${{ inputs.adot-image-name }}
69+
caller-workflow-name: 'main-build'
70+
71+
k8s:
72+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-k8s-test.yml@main
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'

.github/workflows/main-build.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- main
77
- "release/v*"
8-
- e2e-parallel
98

109
env:
1110
AWS_DEFAULT_REGION: us-east-1
@@ -84,15 +83,14 @@ jobs:
8483
# pip install pytest
8584
# pytest contract-tests/tests
8685

87-
# TODO - implement E2E tests in NodeJS
88-
# application-signals-e2e-test:
89-
# name: "Application Signals E2E Test"
90-
# needs: [ build ]
91-
# uses: ./.github/workflows/application-signals-e2e-test.yml
92-
# secrets: inherit
93-
# permissions:
94-
# id-token: write
95-
# contents: read
96-
# with:
97-
# staging-wheel-name: ${{ needs.build.outputs.staging_wheel_file }}
98-
# adot-image-name: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-python-staging:${{ needs.build.outputs.python_image_tag }}
86+
application-signals-e2e-test:
87+
name: "Application Signals E2E Test"
88+
needs: [ build ]
89+
uses: ./.github/workflows/application-signals-e2e-test.yml
90+
secrets: inherit
91+
permissions:
92+
id-token: write
93+
contents: read
94+
with:
95+
staging-instrumentation-name: ${{ needs.build.outputs.staging_tarball_file }}
96+
adot-image-name: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-node-staging:${{ needs.build.outputs.node_image_tag }}

0 commit comments

Comments
 (0)