Skip to content

Commit d31ec2e

Browse files
jj22eejj22ee
committed
java app and traffic gen images for otlp account
1 parent bcaa52d commit d31ec2e

File tree

2 files changed

+250
-121
lines changed

2 files changed

+250
-121
lines changed

‎.github/workflows/java-sample-app-ecr-deploy.yml‎

Lines changed: 172 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,98 @@ env:
1818
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
1919

2020
jobs:
21-
java-v11-main:
21+
# java-v11-main:
22+
# strategy:
23+
# fail-fast: false
24+
# matrix:
25+
# 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',
26+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
27+
# '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',
28+
# 'us-east-1','us-east-2','us-west-1','us-west-2' ]
29+
# runs-on: ubuntu-latest
30+
# steps:
31+
# - uses: actions/checkout@v4
32+
# with:
33+
# fetch-depth: 0
34+
35+
# - name: Configure AWS Credentials
36+
# uses: aws-actions/configure-aws-credentials@v4
37+
# with:
38+
# role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
39+
# aws-region: us-east-1
40+
41+
# - name: Retrieve account
42+
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
43+
# with:
44+
# secret-ids: |
45+
# ACCOUNT_ID, region-account/${{ matrix.aws-region }}
46+
# JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
47+
48+
# - name: Configure AWS Credentials
49+
# uses: aws-actions/configure-aws-credentials@v4
50+
# with:
51+
# role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
52+
# aws-region: ${{ matrix.aws-region }}
53+
54+
# - name: Build and Upload Main Service Image
55+
# working-directory: sample-apps/java/springboot-main-service
56+
# run: |
57+
# sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
58+
# gradle jib -P javaVersion=11
59+
60+
# java-v11-remote:
61+
# strategy:
62+
# fail-fast: false
63+
# matrix:
64+
# 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',
65+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
66+
# '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',
67+
# 'us-east-1','us-east-2','us-west-1','us-west-2' ]
68+
# runs-on: ubuntu-latest
69+
# steps:
70+
# - uses: actions/checkout@v4
71+
# with:
72+
# fetch-depth: 0
73+
74+
# - name: Configure AWS Credentials
75+
# uses: aws-actions/configure-aws-credentials@v4
76+
# with:
77+
# role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
78+
# aws-region: us-east-1
79+
80+
# - name: Retrieve account
81+
# if: ${{ matrix.aws-region }} == 'standard'
82+
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
83+
# with:
84+
# secret-ids: |
85+
# ACCOUNT_ID, region-account/${{ matrix.aws-region }}
86+
# JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
87+
88+
# - name: Retrieve account
89+
# if: ${{ matrix.aws-region }} == 'otlp'
90+
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
91+
# with:
92+
# secret-ids: |
93+
# ACCOUNT_ID, region-account/${{ matrix.aws-region }}
94+
# JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
95+
96+
# - name: Configure AWS Credentials
97+
# uses: aws-actions/configure-aws-credentials@v4
98+
# with:
99+
# role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
100+
# aws-region: ${{ matrix.aws-region }}
101+
102+
# - name: Build and Upload Remote Service Image
103+
# working-directory: sample-apps/java/springboot-remote-service
104+
# run: |
105+
# sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
106+
# gradle jib -P javaVersion=11
107+
108+
java-otlp-main:
22109
strategy:
23110
fail-fast: false
24111
matrix:
25-
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',
26-
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
27-
'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',
28-
'us-east-1','us-east-2','us-west-1','us-west-2' ]
112+
aws-region: [ 'us-east-1' ]
29113
runs-on: ubuntu-latest
30114
steps:
31115
- uses: actions/checkout@v4
@@ -45,6 +129,13 @@ jobs:
45129
ACCOUNT_ID, region-account/${{ matrix.aws-region }}
46130
JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
47131
132+
- name: Retrieve account
133+
uses: aws-actions/aws-secretsmanager-get-secrets@v1
134+
with:
135+
secret-ids: |
136+
ACCOUNT_ID, otlp-region-account/gamma-${{ matrix.aws-region }}
137+
JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
138+
48139
- name: Configure AWS Credentials
49140
uses: aws-actions/configure-aws-credentials@v4
50141
with:
@@ -57,14 +148,11 @@ jobs:
57148
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
58149
gradle jib -P javaVersion=11
59150
60-
java-v11-remote:
151+
java-otlp-remote:
61152
strategy:
62153
fail-fast: false
63154
matrix:
64-
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',
65-
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
66-
'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',
67-
'us-east-1','us-east-2','us-west-1','us-west-2' ]
155+
aws-region: [ 'us-east-1' ]
68156
runs-on: ubuntu-latest
69157
steps:
70158
- uses: actions/checkout@v4
@@ -81,7 +169,7 @@ jobs:
81169
uses: aws-actions/aws-secretsmanager-get-secrets@v1
82170
with:
83171
secret-ids: |
84-
ACCOUNT_ID, region-account/${{ matrix.aws-region }}
172+
ACCOUNT_ID, otlp-region-account/gamma-${{ matrix.aws-region }}
85173
JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
86174
87175
- name: Configure AWS Credentials
@@ -96,82 +184,82 @@ jobs:
96184
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
97185
gradle jib -P javaVersion=11
98186
99-
java-main:
100-
strategy:
101-
fail-fast: false
102-
matrix:
103-
java-version: [ '8', '17', '21', '22' ]
104-
runs-on: ubuntu-latest
105-
steps:
106-
- uses: actions/checkout@v4
107-
- uses: actions/setup-java@v4
108-
with:
109-
distribution: 'temurin'
110-
java-version: ${{ matrix.java-version }}
111-
check-latest: true
187+
# java-main:
188+
# strategy:
189+
# fail-fast: false
190+
# matrix:
191+
# java-version: [ '8', '17', '21', '22' ]
192+
# runs-on: ubuntu-latest
193+
# steps:
194+
# - uses: actions/checkout@v4
195+
# - uses: actions/setup-java@v4
196+
# with:
197+
# distribution: 'temurin'
198+
# java-version: ${{ matrix.java-version }}
199+
# check-latest: true
112200

113-
- name: Configure AWS Credentials
114-
uses: aws-actions/configure-aws-credentials@v4
115-
with:
116-
role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
117-
aws-region: us-east-1
201+
# - name: Configure AWS Credentials
202+
# uses: aws-actions/configure-aws-credentials@v4
203+
# with:
204+
# role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
205+
# aws-region: us-east-1
118206

119-
- name: Retrieve account
120-
uses: aws-actions/aws-secretsmanager-get-secrets@v2
121-
with:
122-
secret-ids: |
123-
JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
207+
# - name: Retrieve account
208+
# uses: aws-actions/aws-secretsmanager-get-secrets@v2
209+
# with:
210+
# secret-ids: |
211+
# JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
124212

125-
- name: Build and Upload Main Service Image
126-
working-directory: sample-apps/java/springboot-main-service
127-
run: |
128-
# For Java 8, springboot must be lower than version 3
129-
# For Java 11,17,21, they are compatible with both springboot version
130-
# For Java 22 and above, springboot must be version 3 or higher
131-
if [ "${{ matrix.java-version }}" = "22" ]; then
132-
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
133-
cat build.gradle.kts
134-
fi
135-
136-
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v${{ matrix.java-version }}"#g' build.gradle.kts
137-
gradle jib -P javaVersion=${{ matrix.java-version }}
138-
139-
java-remote:
140-
strategy:
141-
fail-fast: false
142-
matrix:
143-
java-version: [ '8', '17', '21', '22' ]
144-
runs-on: ubuntu-latest
145-
steps:
146-
- uses: actions/checkout@v4
147-
- uses: actions/setup-java@v4
148-
with:
149-
distribution: 'temurin'
150-
java-version: ${{ matrix.java-version }}
151-
check-latest: true
213+
# - name: Build and Upload Main Service Image
214+
# working-directory: sample-apps/java/springboot-main-service
215+
# run: |
216+
# # For Java 8, springboot must be lower than version 3
217+
# # For Java 11,17,21, they are compatible with both springboot version
218+
# # For Java 22 and above, springboot must be version 3 or higher
219+
# if [ "${{ matrix.java-version }}" = "22" ]; then
220+
# sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
221+
# cat build.gradle.kts
222+
# fi
152223

153-
- name: Configure AWS Credentials
154-
uses: aws-actions/configure-aws-credentials@v4
155-
with:
156-
role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
157-
aws-region: us-east-1
224+
# sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v${{ matrix.java-version }}"#g' build.gradle.kts
225+
# gradle jib -P javaVersion=${{ matrix.java-version }}
158226

159-
- name: Retrieve account
160-
uses: aws-actions/aws-secretsmanager-get-secrets@v2
161-
with:
162-
secret-ids: |
163-
JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
227+
# java-remote:
228+
# strategy:
229+
# fail-fast: false
230+
# matrix:
231+
# java-version: [ '8', '17', '21', '22' ]
232+
# runs-on: ubuntu-latest
233+
# steps:
234+
# - uses: actions/checkout@v4
235+
# - uses: actions/setup-java@v4
236+
# with:
237+
# distribution: 'temurin'
238+
# java-version: ${{ matrix.java-version }}
239+
# check-latest: true
164240

165-
- name: Build and Upload Remote Service Image
166-
working-directory: sample-apps/java/springboot-remote-service
167-
run: |
168-
# For Java 8, springboot must be lower than version 3
169-
# For Java 11,17,21, they are compatible with both springboot version
170-
# For Java 22 and above, springboot must be version 3 or higher
171-
if [ "${{ matrix.java-version }}" = "22" ]; then
172-
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
173-
cat build.gradle.kts
174-
fi
175-
176-
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v${{ matrix.java-version }}"#g' build.gradle.kts
177-
gradle jib -P javaVersion=${{ matrix.java-version }}
241+
# - name: Configure AWS Credentials
242+
# uses: aws-actions/configure-aws-credentials@v4
243+
# with:
244+
# role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
245+
# aws-region: us-east-1
246+
247+
# - name: Retrieve account
248+
# uses: aws-actions/aws-secretsmanager-get-secrets@v2
249+
# with:
250+
# secret-ids: |
251+
# JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
252+
253+
# - name: Build and Upload Remote Service Image
254+
# working-directory: sample-apps/java/springboot-remote-service
255+
# run: |
256+
# # For Java 8, springboot must be lower than version 3
257+
# # For Java 11,17,21, they are compatible with both springboot version
258+
# # For Java 22 and above, springboot must be version 3 or higher
259+
# if [ "${{ matrix.java-version }}" = "22" ]; then
260+
# sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
261+
# cat build.gradle.kts
262+
# fi
263+
264+
# sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v${{ matrix.java-version }}"#g' build.gradle.kts
265+
# gradle jib -P javaVersion=${{ matrix.java-version }}

0 commit comments

Comments
 (0)