diff --git a/.github/workflows/java-ecs-canary.yml b/.github/workflows/java-ecs-canary.yml index 2bbf59b43..bd9946eae 100644 --- a/.github/workflows/java-ecs-canary.yml +++ b/.github/workflows/java-ecs-canary.yml @@ -24,4 +24,5 @@ jobs: secrets: inherit with: aws-region: ${{ matrix.aws-region }} - caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test' \ No newline at end of file + caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test' + java-version: '11' \ No newline at end of file diff --git a/.github/workflows/java-ecs-retry.yml b/.github/workflows/java-ecs-retry.yml index 942f1bf17..2c615a50e 100644 --- a/.github/workflows/java-ecs-retry.yml +++ b/.github/workflows/java-ecs-retry.yml @@ -14,6 +14,9 @@ on: caller-workflow-name: required: true type: string + java-version: + required: true + type: string permissions: id-token: write @@ -26,6 +29,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} + java-version: ${{ inputs.java-version }} java-ecs-attempt-2: needs: [ java-ecs-attempt-1 ] @@ -35,6 +39,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} + java-version: ${{ inputs.java-version }} publish-metric-attempt-1: needs: [ java-ecs-attempt-1, java-ecs-attempt-2 ] diff --git a/.github/workflows/java-ecs-test.yml b/.github/workflows/java-ecs-test.yml index 3a12dfa78..29effe49e 100644 --- a/.github/workflows/java-ecs-test.yml +++ b/.github/workflows/java-ecs-test.yml @@ -14,6 +14,11 @@ on: caller-workflow-name: required: true type: string + java-version: + description: "Currently support version 8, 11, 17, 21, 22" + required: false + type: string + default: '11' adot-image-name: required: false type: string @@ -33,6 +38,7 @@ permissions: env: E2E_TEST_AWS_REGION: ${{ inputs.aws-region }} CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }} + JAVA_VERSION: ${{ inputs.java-version }} ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }} CLUSTER_NAME: e2e-test-java SAMPLE_APP_NAME: main-service-java @@ -107,8 +113,8 @@ jobs: - name: Set Sample App Image run: | - echo MAIN_SAMPLE_APP_IMAGE_URI="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}" >> $GITHUB_ENV - echo REMOTE_SAMPLE_APP_IMAGE_URI="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}" >> $GITHUB_ENV + echo MAIN_SAMPLE_APP_IMAGE_URI="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}" >> $GITHUB_ENV + echo REMOTE_SAMPLE_APP_IMAGE_URI="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}" >> $GITHUB_ENV - name: Set ADOT Java image environment variable run: |