Skip to content

Commit b9f5b4b

Browse files
harrryrharrryr
committed
EC2 Default Language Version Test
1 parent 695e2be commit b9f5b4b

File tree

2 files changed

+111
-63
lines changed

2 files changed

+111
-63
lines changed

‎.github/workflows/test-2.yml‎

Lines changed: 110 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -14,107 +14,155 @@ permissions:
1414
contents: read
1515

1616
jobs:
17-
eks-8:
17+
# eks-8:
18+
# strategy:
19+
# fail-fast: false
20+
# matrix:
21+
# aws-region: [ 'us-east-1' ]
22+
# uses: ./.github/workflows/java-eks-retry.yml
23+
# secrets: inherit
24+
# with:
25+
# aws-region: ${{ matrix.aws-region }}
26+
# test-cluster-name: 'e2e-canary-test'
27+
# caller-workflow-name: 'appsignals-e2e-eks-canary-test'
28+
# java-version: '8'
29+
#
30+
# eks-11:
31+
# needs: eks-8
32+
# strategy:
33+
# fail-fast: false
34+
# matrix:
35+
# aws-region: [ 'us-east-1' ]
36+
# uses: ./.github/workflows/java-eks-retry.yml
37+
# secrets: inherit
38+
# with:
39+
# aws-region: ${{ matrix.aws-region }}
40+
# test-cluster-name: 'e2e-canary-test'
41+
# caller-workflow-name: 'appsignals-e2e-eks-canary-test'
42+
# java-version: '11'
43+
#
44+
# eks-17:
45+
# needs: eks-11
46+
# strategy:
47+
# fail-fast: false
48+
# matrix:
49+
# aws-region: [ 'us-east-1' ]
50+
# uses: ./.github/workflows/java-eks-retry.yml
51+
# secrets: inherit
52+
# with:
53+
# aws-region: ${{ matrix.aws-region }}
54+
# test-cluster-name: 'e2e-canary-test'
55+
# caller-workflow-name: 'appsignals-e2e-eks-canary-test'
56+
# java-version: '17'
57+
#
58+
# eks-21:
59+
# needs: eks-17
60+
# strategy:
61+
# fail-fast: false
62+
# matrix:
63+
# aws-region: [ 'us-east-1' ]
64+
# uses: ./.github/workflows/java-eks-retry.yml
65+
# secrets: inherit
66+
# with:
67+
# aws-region: ${{ matrix.aws-region }}
68+
# test-cluster-name: 'e2e-canary-test'
69+
# caller-workflow-name: 'appsignals-e2e-eks-canary-test'
70+
# java-version: '21'
71+
#
72+
# eks-22:
73+
# needs: eks-21
74+
# strategy:
75+
# fail-fast: false
76+
# matrix:
77+
# aws-region: [ 'us-east-1' ]
78+
# uses: ./.github/workflows/java-eks-retry.yml
79+
# secrets: inherit
80+
# with:
81+
# aws-region: ${{ matrix.aws-region }}
82+
# test-cluster-name: 'e2e-canary-test'
83+
# caller-workflow-name: 'appsignals-e2e-eks-canary-test'
84+
# java-version: '22'
85+
86+
# k8s:
87+
# uses: ./.github/workflows/java-k8s-retry.yml
88+
# secrets: inherit
89+
# with:
90+
# # To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
91+
# aws-region: 'us-east-1'
92+
# caller-workflow-name: 'appsignals-e2e-k8s-canary-test'
93+
# java-version: '11'
94+
#
95+
# ecs:
96+
# strategy:
97+
# fail-fast: false
98+
# matrix:
99+
# aws-region: ['us-east-1']
100+
# uses: ./.github/workflows/java-ecs-retry.yml
101+
# secrets: inherit
102+
# with:
103+
# aws-region: ${{ matrix.aws-region }}
104+
# caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
105+
# java-version: '11'
106+
#
107+
github-8:
18108
strategy:
19109
fail-fast: false
20110
matrix:
21-
aws-region: [ 'us-east-1' ]
22-
uses: ./.github/workflows/java-eks-retry.yml
111+
aws-region: ['us-east-1']
112+
uses: ./.github/workflows/java-ec2-default-retry.yml
23113
secrets: inherit
24114
with:
25115
aws-region: ${{ matrix.aws-region }}
26-
test-cluster-name: 'e2e-canary-test'
27-
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
116+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
28117
java-version: '8'
29118

30-
eks-11:
31-
needs: eks-8
119+
github-11:
32120
strategy:
33121
fail-fast: false
34122
matrix:
35-
aws-region: [ 'us-east-1' ]
36-
uses: ./.github/workflows/java-eks-retry.yml
123+
aws-region: ['us-east-1']
124+
uses: ./.github/workflows/java-ec2-default-retry.yml
37125
secrets: inherit
38126
with:
39127
aws-region: ${{ matrix.aws-region }}
40-
test-cluster-name: 'e2e-canary-test'
41-
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
128+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
42129
java-version: '11'
43130

44-
eks-17:
45-
needs: eks-11
131+
github-17:
46132
strategy:
47133
fail-fast: false
48134
matrix:
49-
aws-region: [ 'us-east-1' ]
50-
uses: ./.github/workflows/java-eks-retry.yml
135+
aws-region: ['us-east-1']
136+
uses: ./.github/workflows/java-ec2-default-retry.yml
51137
secrets: inherit
52138
with:
53139
aws-region: ${{ matrix.aws-region }}
54-
test-cluster-name: 'e2e-canary-test'
55-
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
140+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
56141
java-version: '17'
57142

58-
eks-21:
59-
needs: eks-17
143+
github-21:
60144
strategy:
61145
fail-fast: false
62146
matrix:
63-
aws-region: [ 'us-east-1' ]
64-
uses: ./.github/workflows/java-eks-retry.yml
147+
aws-region: ['us-east-1']
148+
uses: ./.github/workflows/java-ec2-default-retry.yml
65149
secrets: inherit
66150
with:
67151
aws-region: ${{ matrix.aws-region }}
68-
test-cluster-name: 'e2e-canary-test'
69-
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
152+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
70153
java-version: '21'
71154

72-
eks-22:
73-
needs: eks-21
155+
github-22:
74156
strategy:
75157
fail-fast: false
76158
matrix:
77-
aws-region: [ 'us-east-1' ]
78-
uses: ./.github/workflows/java-eks-retry.yml
159+
aws-region: ['us-east-1']
160+
uses: ./.github/workflows/java-ec2-default-retry.yml
79161
secrets: inherit
80162
with:
81163
aws-region: ${{ matrix.aws-region }}
82-
test-cluster-name: 'e2e-canary-test'
83-
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
164+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
84165
java-version: '22'
85-
86-
# k8s:
87-
# uses: ./.github/workflows/java-k8s-retry.yml
88-
# secrets: inherit
89-
# with:
90-
# # To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
91-
# aws-region: 'us-east-1'
92-
# caller-workflow-name: 'appsignals-e2e-k8s-canary-test'
93-
# java-version: '11'
94-
#
95-
# ecs:
96-
# strategy:
97-
# fail-fast: false
98-
# matrix:
99-
# aws-region: ['us-east-1']
100-
# uses: ./.github/workflows/java-ecs-retry.yml
101-
# secrets: inherit
102-
# with:
103-
# aws-region: ${{ matrix.aws-region }}
104-
# caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
105-
# java-version: '11'
106-
#
107-
# github:
108-
# strategy:
109-
# fail-fast: false
110-
# matrix:
111-
# aws-region: ['us-east-1']
112-
# uses: ./.github/workflows/java-ec2-default-retry.yml
113-
# secrets: inherit
114-
# with:
115-
# aws-region: ${{ matrix.aws-region }}
116-
# caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
117-
# java-version: '11'
118166
#
119167
# maven:
120168
# uses: ./.github/workflows/java-ec2-default-retry.yml

‎terraform/java/ec2/default/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ resource "null_resource" "traffic_generator_setup" {
257257
sudo yum install nodejs aws-cli unzip tmux -y
258258
259259
# Bring in the traffic generator files to EC2 Instance
260-
aws s3 cp s3://aws-appsignals-sample-app-prod-${var.aws_region}/traffic-generator.zip ./traffic-generator.zip
260+
aws s3 cp s3://aws-appsignals-sample-app-prod-${var.aws_region}-2/traffic-generator.zip ./traffic-generator.zip
261261
unzip ./traffic-generator.zip -d ./
262262
263263
# Install the traffic generator dependencies

0 commit comments

Comments
 (0)