diff --git a/.github/workflows/java-sample-app-ecr-deploy.yml b/.github/workflows/java-sample-app-ecr-deploy.yml index c9822e2bb..1d4cad6eb 100644 --- a/.github/workflows/java-sample-app-ecr-deploy.yml +++ b/.github/workflows/java-sample-app-ecr-deploy.yml @@ -8,6 +8,7 @@ name: Sample App Deployment - Java ECR on: workflow_dispatch: # be able to run the workflow on demand + push: permissions: id-token: write @@ -54,7 +55,7 @@ jobs: - name: Build and Upload Main Service Image working-directory: sample-apps/java/springboot-main-service run: | - 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 + 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 gradle jib -P javaVersion=11 java-v11-remote: @@ -93,7 +94,7 @@ jobs: - name: Build and Upload Remote Service Image working-directory: sample-apps/java/springboot-remote-service run: | - 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 + 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 gradle jib -P javaVersion=11 java-main: diff --git a/.github/workflows/python-sample-app-s3-deploy.yml b/.github/workflows/python-sample-app-s3-deploy.yml index 4bca1e128..ce843b5b8 100644 --- a/.github/workflows/python-sample-app-s3-deploy.yml +++ b/.github/workflows/python-sample-app-s3-deploy.yml @@ -1,6 +1,8 @@ ## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. ## SPDX-License-Identifier: Apache-2.0 +# 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) +# will be uploaded to us-east-1 for the purpose of testing ADOT Java name: Sample App Deployment - Python S3 on: workflow_dispatch: # be able to run the workflow on demand @@ -42,8 +44,6 @@ jobs: role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ secrets.E2E_TEST_ROLE_ARN }} aws-region: ${{ matrix.aws-region }} - - - name: Build Sample App Zip working-directory: sample-apps/python run: zip -r python-sample-app.zip .