Skip to content

Commit 70786d3

Browse files
committed
[Node/EC2] Run canary in all regions
1 parent 4dea1a4 commit 70786d3

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

.github/workflows/node-ec2-canary.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
aws-region: [ 'us-east-1' ]
24-
# aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
25-
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
26-
# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
27-
# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2']
23+
aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
24+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
25+
'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
26+
'us-east-1','us-east-2', 'us-west-1', 'us-west-2']
2827
uses: ./.github/workflows/node-ec2-default-retry.yml
2928
secrets: inherit
3029
with:

.github/workflows/node-ec2-default-test.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
type: string
1717
staging-instrumentation-name:
1818
required: false
19-
default: 'aws-aws-distro-opentelemetry-node-autoinstrumentation-0.0.1.tgz'
19+
default: '@aws/aws-distro-opentelemetry-node-autoinstrumentation'
2020
type: string
2121
outputs:
2222
job-started:
@@ -31,7 +31,7 @@ permissions:
3131
env:
3232
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
3333
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
34-
ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name }}
34+
ADOT_INSTRUMENTATION_NAME: '@aws/aws-distro-opentelemetry-node-autoinstrumentation'
3535
SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/node-sample-app.zip
3636
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
3737
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
@@ -92,20 +92,13 @@ jobs:
9292
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
9393
aws-region: ${{ env.E2E_TEST_AWS_REGION }}
9494

95-
# TODO: Remove the following step once release testing is ready
96-
- name: TEMPORARY TEST CONFIGS
97-
run: |
98-
echo ADOT_INSTRUMENTATION_NAME="aws-aws-distro-opentelemetry-node-autoinstrumentation-0.0.1.tgz" >> $GITHUB_ENV
99-
10095
- name: Set Get ADOT Instrumentation command environment variable
10196
run: |
102-
echo GET_ADOT_INSTRUMENTATION_COMMAND="aws s3 cp s3://adot-autoinstrumentation-node-staging/${{ env.ADOT_INSTRUMENTATION_NAME }} ./${{ env.ADOT_INSTRUMENTATION_NAME }} && npm install ${{ env.ADOT_INSTRUMENTATION_NAME }}" >> $GITHUB_ENV
103-
# TODO: Reintroduce release testing logic when artifacts are ready
104-
# if [ "${{ github.event.repository.name }}" = "aws-otel-js-instrumentation" ]; then
105-
# echo GET_ADOT_INSTRUMENTATION_COMMAND="aws s3 cp s3://adot-autoinstrumentation-node-staging/${{ env.ADOT_INSTRUMENTATION_NAME }} ./${{ env.ADOT_INSTRUMENTATION_NAME }} && npm install ${{ env.ADOT_INSTRUMENTATION_NAME }}" >> $GITHUB_ENV
106-
# else
107-
# echo GET_ADOT_INSTRUMENTATION_COMMAND="npm install ${{ env.ADOT_INSTRUMENTATION_NAME }}" >> $GITHUB_ENV
108-
# fi
97+
if [ "${{ github.event.repository.name }}" = "aws-otel-js-instrumentation" ]; then
98+
echo GET_ADOT_INSTRUMENTATION_COMMAND="aws s3 cp s3://adot-autoinstrumentation-node-staging/${{ env.ADOT_INSTRUMENTATION_NAME }} ./${{ env.ADOT_INSTRUMENTATION_NAME }} && npm install ${{ env.ADOT_INSTRUMENTATION_NAME }}" >> $GITHUB_ENV
99+
else
100+
echo GET_ADOT_INSTRUMENTATION_COMMAND="npm install ${{ env.ADOT_INSTRUMENTATION_NAME }}" >> $GITHUB_ENV
101+
fi
109102
110103
- name: Set Get CW Agent command environment variable
111104
run: |

0 commit comments

Comments
 (0)