Skip to content

Add Java Version Option for K8s #260

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 Java Version Option for K8s #260

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
64db019
Add Language Version Option for Java E2E K8s
harrryr Sep 27, 2024
a2793e8
Switch to inputs from 11
harrryr Sep 27, 2024
9719429
Merge branch 'main' into update-java-e2e-k8s-test-language-version
harrryr Sep 27, 2024
d0a182c
Merge branch 'main' into update-java-e2e-k8s-test-language-version
harrryr Sep 27, 2024
92b386f
Merge branch 'main' into update-java-e2e-k8s-test-language-version
majanjua-amzn 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-k8s-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ jobs:
with:
# To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
aws-region: 'us-east-1'
caller-workflow-name: 'appsignals-e2e-k8s-canary-test'
caller-workflow-name: 'appsignals-e2e-k8s-canary-test'
java-version: '11'
5 changes: 5 additions & 0 deletions .github/workflows/java-k8s-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

concurrency:
group: 'java-k8s-${{ inputs.aws-region }}-${{ github.ref_name }}'
Expand All @@ -30,6 +33,7 @@ jobs:
with:
aws-region: ${{ inputs.aws-region }}
caller-workflow-name: ${{ inputs.caller-workflow-name }}
java-version: ${{ inputs.java-version }}

java-k8s-attempt-2:
needs: [ java-k8s-attempt-1 ]
Expand All @@ -39,6 +43,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-k8s-attempt-1, java-k8s-attempt-2 ]
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/java-k8s-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-repository:
required: false
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 }}
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
CALLER_REPOSITORY: ${{ inputs.caller-repository }}
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 @@ -114,9 +120,9 @@ jobs:
working-directory: terraform/java/k8s/deploy/resources
run: |
sed -i 's#\${TESTING_ID}#${{ env.TESTING_ID }}#' frontend-service-depl.yaml
sed -i 's#\${IMAGE}#${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}#' frontend-service-depl.yaml
sed -i 's#\${IMAGE}#${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}#' frontend-service-depl.yaml
sed -i 's#\${TESTING_ID}#${{ env.TESTING_ID }}#' remote-service-depl.yaml
sed -i 's#\${IMAGE}#${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}#' remote-service-depl.yaml
sed -i 's#\${IMAGE}#${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}#' remote-service-depl.yaml
aws s3api put-object --bucket aws-appsignals-sample-app-prod-${{ env.E2E_TEST_AWS_REGION }} --key frontend-service-depl-${{ env.TESTING_ID }}.yaml --body frontend-service-depl.yaml
aws s3api put-object --bucket aws-appsignals-sample-app-prod-${{ env.E2E_TEST_AWS_REGION }} --key remote-service-depl-${{ env.TESTING_ID }}.yaml --body remote-service-depl.yaml

Expand Down