diff --git a/.github/workflows/python-ecs-canary.yml b/.github/workflows/python-ecs-canary.yml index d2c8ffb4f..dadea3d20 100644 --- a/.github/workflows/python-ecs-canary.yml +++ b/.github/workflows/python-ecs-canary.yml @@ -24,4 +24,5 @@ jobs: secrets: inherit with: aws-region: ${{ matrix.aws-region }} - caller-workflow-name: 'appsignals-e2e-python-ecs-canary-test' \ No newline at end of file + caller-workflow-name: 'appsignals-e2e-python-ecs-canary-test' + python-version: '3.10' \ No newline at end of file diff --git a/.github/workflows/python-ecs-retry.yml b/.github/workflows/python-ecs-retry.yml index 025572ac2..5d3be66ec 100644 --- a/.github/workflows/python-ecs-retry.yml +++ b/.github/workflows/python-ecs-retry.yml @@ -14,6 +14,9 @@ on: caller-workflow-name: required: true type: string + python-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 }} + python-version: ${{ inputs.python-version }} python-ecs-attempt-2: needs: [ python-ecs-attempt-1 ] @@ -35,6 +39,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} + python-version: ${{ inputs.python-version }} publish-metric-attempt-1: needs: [ python-ecs-attempt-1, python-ecs-attempt-2 ] diff --git a/.github/workflows/python-ecs-test.yml b/.github/workflows/python-ecs-test.yml index 0f5f513b4..4ccff086f 100644 --- a/.github/workflows/python-ecs-test.yml +++ b/.github/workflows/python-ecs-test.yml @@ -14,6 +14,11 @@ on: caller-workflow-name: required: true type: string + python-version: + description: "Currently support version 3.8, 3.9, 3.10, 3.11, 3.12" + required: false + type: string + default: '3.10' 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 }} + PYTHON_VERSION: ${{ inputs.python-version }} ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }} CLUSTER_NAME: e2e-test-python SAMPLE_APP_NAME: main-service-python @@ -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.PYTHON_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.PYTHON_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.PYTHON_MAIN_SAMPLE_APP_IMAGE }}:v${{ env.PYTHON_VERSION }}" >> $GITHUB_ENV + echo REMOTE_SAMPLE_APP_IMAGE_URI="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.PYTHON_REMOTE_SAMPLE_APP_IMAGE }}:v${{ env.PYTHON_VERSION }}" >> $GITHUB_ENV - name: Set ADOT Python image environment variable run: |