Skip to content

Commit 7a3d2d1

Browse files
committed
Increase retry wait time to 60 second for Terraform
1 parent 38765f7 commit 7a3d2d1

10 files changed

+136
-0
lines changed

.github/workflows/java-ec2-asg-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
100100
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
101101
&& sudo apt update && sudo apt install terraform'
102+
sleep_time: 60
102103

103104
- name: Initiate Terraform
104105
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/java-ec2-default-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
100100
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
101101
&& sudo apt update && sudo apt install terraform'
102+
sleep_time: 60
102103

103104
- name: Initiate Terraform
104105
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/java-eks-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ jobs:
156156
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
157157
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
158158
&& sudo apt update && sudo apt install terraform'
159+
sleep_time: 60
159160

160161
- name: Get RDS database cluster metadata
161162
continue-on-error: true

.github/workflows/java-k8s-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
100100
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
101101
&& sudo apt update && sudo apt install terraform'
102+
sleep_time: 60
102103

103104
- name: Initiate Terraform
104105
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/java-metric-limiter-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ jobs:
158158
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
159159
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
160160
&& sudo apt update && sudo apt install terraform'
161+
sleep_time: 60
161162

162163
- name: Initiate Terraform
163164
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/python-ec2-asg-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ jobs:
103103
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
104104
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
105105
&& sudo apt update && sudo apt install terraform'
106+
sleep_time: 60
106107

107108
- name: Initiate Terraform
108109
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/python-ec2-default-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
103103
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
104104
&& sudo apt update && sudo apt install terraform'
105+
sleep_time: 60
105106

106107
- name: Initiate Terraform
107108
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/python-eks-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
158158
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
159159
&& sudo apt update && sudo apt install terraform'
160+
sleep_time: 60
160161

161162
- name: Get RDS database cluster metadata
162163
continue-on-error: true

.github/workflows/python-k8s-e2e-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
100100
post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
101101
&& sudo apt update && sudo apt install terraform'
102+
sleep_time: 60
102103

103104
- name: Initiate Terraform
104105
uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/test.yml

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
## This workflow aims to run the Application Signals end-to-end tests as a canary to
5+
## test the artifacts for App Signals enablement. It will deploy a sample app and remote
6+
## service on two EC2 instances, call the APIs, and validate the generated telemetry,
7+
## including logs, metrics, and traces.
8+
name: Test
9+
on:
10+
workflow_dispatch:
11+
push:
12+
13+
permissions:
14+
id-token: write
15+
contents: read
16+
17+
jobs:
18+
java-eks:
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
aws-region: [ 'us-east-1' ]
23+
uses: ./.github/workflows/java-eks-e2e-test.yml
24+
secrets: inherit
25+
with:
26+
aws-region: ${{ matrix.aws-region }}
27+
test-cluster-name: 'e2e-playground'
28+
caller-workflow-name: 'test'
29+
30+
python-eks:
31+
needs: java-eks
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
aws-region: [ 'us-east-1' ]
36+
uses: ./.github/workflows/python-eks-e2e-test.yml
37+
secrets: inherit
38+
with:
39+
aws-region: ${{ matrix.aws-region }}
40+
test-cluster-name: 'e2e-playground'
41+
caller-workflow-name: 'test'
42+
43+
metric-limiter:
44+
needs: python-eks
45+
strategy:
46+
fail-fast: false
47+
matrix:
48+
aws-region: [ 'us-east-1' ]
49+
uses: ./.github/workflows/java-metric-limiter-e2e-test.yml
50+
secrets: inherit
51+
with:
52+
aws-region: ${{ matrix.aws-region }}
53+
test-cluster-name: 'e2e-playground'
54+
caller-workflow-name: 'test'
55+
56+
default:
57+
strategy:
58+
fail-fast: false
59+
matrix:
60+
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',
61+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
62+
'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',
63+
'us-east-2', 'us-west-1', 'us-west-2', 'us-east-1']
64+
uses: ./.github/workflows/java-ec2-default-e2e-test.yml
65+
secrets: inherit
66+
with:
67+
aws-region: ${{ matrix.aws-region }}
68+
caller-workflow-name: 'test'
69+
70+
asg:
71+
strategy:
72+
fail-fast: false
73+
matrix:
74+
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',
75+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
76+
'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',
77+
'us-east-2', 'us-west-1', 'us-west-2', 'us-east-1']
78+
uses: ./.github/workflows/java-ec2-asg-e2e-test.yml
79+
secrets: inherit
80+
with:
81+
aws-region: ${{ matrix.aws-region }}
82+
caller-workflow-name: 'test'
83+
84+
python-default:
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
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',
89+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
90+
'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',
91+
'us-east-2', 'us-west-1', 'us-west-2', 'us-east-1' ]
92+
uses: ./.github/workflows/python-ec2-default-e2e-test.yml
93+
secrets: inherit
94+
with:
95+
aws-region: ${{ matrix.aws-region }}
96+
caller-workflow-name: 'test'
97+
98+
python-asg:
99+
strategy:
100+
fail-fast: false
101+
matrix:
102+
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',
103+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
104+
'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',
105+
'us-east-2', 'us-west-1', 'us-west-2', 'us-east-1' ]
106+
uses: ./.github/workflows/python-ec2-asg-e2e-test.yml
107+
secrets: inherit
108+
with:
109+
aws-region: ${{ matrix.aws-region }}
110+
caller-workflow-name: 'test'
111+
112+
# java-k8s:
113+
# uses: ./.github/workflows/java-k8s-e2e-test.yml
114+
# secrets: inherit
115+
# with:
116+
# # To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
117+
# aws-region: 'us-east-1'
118+
# caller-workflow-name: 'test'
119+
#
120+
# python-k8s:
121+
# needs: java-k8s
122+
# uses: ./.github/workflows/python-k8s-e2e-test.yml
123+
# secrets: inherit
124+
# with:
125+
# # To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
126+
# aws-region: 'us-east-1'
127+
# caller-workflow-name: 'test'

0 commit comments

Comments
 (0)