Skip to content

Add Language Version Option for Java E2E ECS #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Add Language Version Option for Java E2E ECS #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e2a75b
Add Language Version Option for Java E2E ECS
harrryr Sep 27, 2024
6b38190
Switch to inputs from 11
harrryr Sep 27, 2024
4822d21
Merge branch 'main' into update-java-e2e-ecs-test-language-version
harrryr Sep 27, 2024
ff44013
Merge branch 'main' into update-java-e2e-ecs-test-language-version
harrryr Sep 27, 2024
01822ac
Merge branch 'main' into update-java-e2e-ecs-test-language-version
harrryr Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/java-ecs-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ jobs:
secrets: inherit
with:
aws-region: ${{ matrix.aws-region }}
caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
java-version: '11'
5 changes: 5 additions & 0 deletions .github/workflows/java-ecs-retry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ on:
caller-workflow-name:
required: true
type: string
java-version:
required: true
type: string

permissions:
id-token: write
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/java-ecs-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down