Skip to content

Commit 50244fc

Browse files
committed
Update variable name for java ecr build
1 parent d50fe77 commit 50244fc

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
name: Sample App Deployment - Java ECR
99
on:
1010
workflow_dispatch: # be able to run the workflow on demand
11+
push:
1112

1213
permissions:
1314
id-token: write
@@ -54,7 +55,7 @@ jobs:
5455
- name: Build and Upload Main Service Image
5556
working-directory: sample-apps/java/springboot-main-service
5657
run: |
57-
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
58+
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
5859
gradle jib -P javaVersion=11
5960
6061
java-v11-remote:
@@ -93,7 +94,7 @@ jobs:
9394
- name: Build and Upload Remote Service Image
9495
working-directory: sample-apps/java/springboot-remote-service
9596
run: |
96-
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
97+
sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
9798
gradle jib -P javaVersion=11
9899
99100
java-main:

.github/workflows/python-sample-app-s3-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
## SPDX-License-Identifier: Apache-2.0
33

4+
# This workflow is for building and uploading the Python sample application to S3 bucket. Python11 will be built and uploaded to all regions to be used by the canary while other versions (8, 17, 21, 22)
5+
# will be uploaded to us-east-1 for the purpose of testing ADOT Java
46
name: Sample App Deployment - Python S3
57
on:
68
workflow_dispatch: # be able to run the workflow on demand
@@ -42,8 +44,6 @@ jobs:
4244
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ secrets.E2E_TEST_ROLE_ARN }}
4345
aws-region: ${{ matrix.aws-region }}
4446

45-
46-
4747
- name: Build Sample App Zip
4848
working-directory: sample-apps/python
4949
run: zip -r python-sample-app.zip .

0 commit comments

Comments
 (0)