Skip to content

Add Language Version Option for Java E2E EKS #3

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

Closed
wants to merge 11 commits into from
Closed

Add Language Version Option for Java E2E EKS #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96dabc8
Build Java Sample App with different language versions
harrryr Sep 17, 2024
b5c5748
Build Java Sample App with different language versions
harrryr Sep 17, 2024
1a68d28
Merge branch 'harrryr-java-sample-app-version'
harrryr Sep 23, 2024
6756273
Add mysql changes
harrryr Sep 23, 2024
858e4d3
Merge branch 'main' into java-sample-app-version
harrryr Sep 23, 2024
93179a1
Update gradle wrapper
harrryr Sep 23, 2024
d31375a
Add Language Version Option For Java E2E EC2
harrryr Sep 24, 2024
a986e5d
Add Language Version Option for Java E2E EKS
harrryr Sep 26, 2024
4e12a04
Merge branch 'main' into update-java-e2e-eks-test-language-version
harrryr Sep 27, 2024
d5a681c
Switch to inputs for 11
harrryr Sep 27, 2024
9559337
Merge branch 'main' into update-java-e2e-eks-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
1 change: 1 addition & 0 deletions .github/workflows/java-eks-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ jobs:
aws-region: ${{ matrix.aws-region }}
test-cluster-name: 'e2e-canary-test'
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
java-version: '11'
5 changes: 5 additions & 0 deletions .github/workflows/java-eks-retry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ on:
caller-workflow-name:
required: true
type: string
java-version:
required: true
type: string

concurrency:
group: 'java-eks-${{ inputs.aws-region }}-${{ github.ref_name }}'
Expand All @@ -34,6 +37,7 @@ jobs:
aws-region: ${{ inputs.aws-region }}
test-cluster-name: ${{ inputs.test-cluster-name }}
caller-workflow-name: ${{ inputs.caller-workflow-name }}
java-version: ${{ inputs.java-version }}

java-eks-attempt-2:
needs: [ java-eks-attempt-1 ]
Expand All @@ -44,6 +48,7 @@ jobs:
aws-region: ${{ inputs.aws-region }}
test-cluster-name: ${{ inputs.test-cluster-name }}
caller-workflow-name: ${{ inputs.caller-workflow-name }}
java-version: ${{ inputs.java-version }}

publish-metric-attempt-1:
needs: [ java-eks-attempt-1, java-eks-attempt-2 ]
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/java-eks-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,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 @@ -37,6 +42,7 @@ env:
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
CLUSTER_NAME: ${{ inputs.test-cluster-name }}
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
JAVA_VERSION: ${{ inputs.java-version }}
ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }}
CW_AGENT_OPERATOR_TAG: ${{ inputs.cw-agent-operator-tag }}
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
Expand Down Expand Up @@ -222,8 +228,8 @@ jobs:

- name: Set Sample App Image
run: |
echo MAIN_SAMPLE_APP_IMAGE_ARN="${{ 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_ARN="${{ 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_ARN="${{ 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_ARN="${{ 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: Deploy sample app via terraform and wait for the endpoint to come online
id: deploy-sample-app
Expand Down