From 64db019778c31ce44fee77b00577a7cf69019bc0 Mon Sep 17 00:00:00 2001 From: Harry Date: Thu, 26 Sep 2024 17:10:16 -0700 Subject: [PATCH 1/2] Add Language Version Option for Java E2E K8s --- .github/workflows/java-k8s-canary.yml | 3 ++- .github/workflows/java-k8s-retry.yml | 5 +++++ .github/workflows/java-k8s-test.yml | 10 ++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-k8s-canary.yml b/.github/workflows/java-k8s-canary.yml index fd1137c3c..9bbc2aac7 100644 --- a/.github/workflows/java-k8s-canary.yml +++ b/.github/workflows/java-k8s-canary.yml @@ -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' \ No newline at end of file + caller-workflow-name: 'appsignals-e2e-k8s-canary-test' + java-version: '11' \ No newline at end of file diff --git a/.github/workflows/java-k8s-retry.yml b/.github/workflows/java-k8s-retry.yml index 2d2042440..492a86226 100644 --- a/.github/workflows/java-k8s-retry.yml +++ b/.github/workflows/java-k8s-retry.yml @@ -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 }}' @@ -30,6 +33,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} + java-version: '11' java-k8s-attempt-2: needs: [ java-k8s-attempt-1 ] @@ -39,6 +43,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} + java-version: '11' publish-metric-attempt-1: needs: [ java-k8s-attempt-1, java-k8s-attempt-2 ] diff --git a/.github/workflows/java-k8s-test.yml b/.github/workflows/java-k8s-test.yml index 633fa5621..61bef4c85 100644 --- a/.github/workflows/java-k8s-test.yml +++ b/.github/workflows/java-k8s-test.yml @@ -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 @@ -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 }} @@ -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 From a2793e80ef361b7f4d3be0fb9c6d53e7ff94959e Mon Sep 17 00:00:00 2001 From: Harry Date: Fri, 27 Sep 2024 09:20:42 -0700 Subject: [PATCH 2/2] Switch to inputs from 11 --- .github/workflows/java-k8s-retry.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-k8s-retry.yml b/.github/workflows/java-k8s-retry.yml index 492a86226..fe85a14c5 100644 --- a/.github/workflows/java-k8s-retry.yml +++ b/.github/workflows/java-k8s-retry.yml @@ -33,7 +33,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: '11' + java-version: ${{ inputs.java-version }} java-k8s-attempt-2: needs: [ java-k8s-attempt-1 ] @@ -43,7 +43,7 @@ jobs: with: aws-region: ${{ inputs.aws-region }} caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: '11' + java-version: ${{ inputs.java-version }} publish-metric-attempt-1: needs: [ java-k8s-attempt-1, java-k8s-attempt-2 ]