Skip to content

Commit 8b6e49e

Browse files
harrryrharrryr
committed
Test
1 parent 93179a1 commit 8b6e49e

13 files changed

+60
-12
lines changed

‎.github/workflows/java-ec2-asg-test.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
caller-workflow-name:
1515
required: true
1616
type: string
17+
java-version:
18+
required: false
19+
type: string
20+
default: '11'
1721
outputs:
1822
job-started:
1923
value: ${{ jobs.java-ec2-asg.outputs.job-started }}
@@ -27,8 +31,8 @@ permissions:
2731
env:
2832
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
2933
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
30-
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/main-service.jar
31-
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/remote-service.jar
34+
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-main-service-v${{ inputs.java-version }}.jar
35+
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-remote-service-v${{ inputs.java-version }}.jar
3236
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
3337
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3438
METRIC_NAMESPACE: ApplicationSignals

‎.github/workflows/java-ec2-canary.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
with:
3030
aws-region: ${{ matrix.aws-region }}
3131
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
32+
java-version: '11'
3233

3334
maven:
3435
uses: ./.github/workflows/java-ec2-default-retry.yml
@@ -37,3 +38,4 @@ jobs:
3738
aws-region: 'us-east-1'
3839
caller-workflow-name: 'appsignals-e2e-ec2-maven-canary-test'
3940
otel-source: 'maven'
41+
java-version: '11'

‎.github/workflows/java-ec2-default-retry.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
caller-workflow-name:
1515
required: true
1616
type: string
17+
java-version:
18+
required: true
19+
type: string
1720
otel-source:
1821
required: false
1922
type: string
@@ -30,6 +33,7 @@ jobs:
3033
with:
3134
aws-region: ${{ inputs.aws-region }}
3235
caller-workflow-name: ${{ inputs.caller-workflow-name }}
36+
java-version: ${{ inputs.java-version }}
3337
otel-source: ${{ inputs.otel-source }}
3438

3539
java-ec2-default-attempt-2:
@@ -40,6 +44,7 @@ jobs:
4044
with:
4145
aws-region: ${{ inputs.aws-region }}
4246
caller-workflow-name: ${{ inputs.caller-workflow-name }}
47+
java-version: ${{ inputs.java-version }}
4348
otel-source: ${{ inputs.otel-source }}
4449

4550
publish-metric-attempt-1:

‎.github/workflows/java-ec2-default-test.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
caller-workflow-name:
1515
required: true
1616
type: string
17+
java-version:
18+
required: false
19+
type: string
20+
default: '11'
1721
otel-source:
1822
required: false
1923
type: string
@@ -32,8 +36,8 @@ env:
3236
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
3337
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
3438
OTEL_SOURCE: ${{ inputs.otel-source }}
35-
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/main-service.jar
36-
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/remote-service.jar
39+
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-main-service-v${{ inputs.java-version }}.jar
40+
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-remote-service-v${{ inputs.java-version }}.jar
3741
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
3842
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3943
METRIC_NAMESPACE: ApplicationSignals

‎.github/workflows/java-ecs-canary.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ jobs:
2424
secrets: inherit
2525
with:
2626
aws-region: ${{ matrix.aws-region }}
27-
caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
27+
caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
28+
java-version: '11'

‎.github/workflows/java-ecs-retry.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
caller-workflow-name:
1515
required: true
1616
type: string
17+
java-version:
18+
required: true
19+
type: string
1720

1821
permissions:
1922
id-token: write
@@ -26,6 +29,7 @@ jobs:
2629
with:
2730
aws-region: ${{ inputs.aws-region }}
2831
caller-workflow-name: ${{ inputs.caller-workflow-name }}
32+
java-version: ${{ inputs.java-version }}
2933

3034
java-ecs-attempt-2:
3135
needs: [ java-ecs-attempt-1 ]
@@ -35,6 +39,7 @@ jobs:
3539
with:
3640
aws-region: ${{ inputs.aws-region }}
3741
caller-workflow-name: ${{ inputs.caller-workflow-name }}
42+
java-version: ${{ inputs.java-version }}
3843

3944
publish-metric-attempt-1:
4045
needs: [ java-ecs-attempt-1, java-ecs-attempt-2 ]

‎.github/workflows/java-ecs-test.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
caller-workflow-name:
1515
required: true
1616
type: string
17+
java-version:
18+
required: false
19+
type: string
20+
default: '11'
1721
adot-image-name:
1822
required: false
1923
type: string
@@ -33,6 +37,7 @@ permissions:
3337
env:
3438
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
3539
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
40+
JAVA_VERSION: ${{ inputs.java-version }}
3641
ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }}
3742
CLUSTER_NAME: e2e-test-java
3843
SAMPLE_APP_NAME: main-service-java
@@ -107,8 +112,8 @@ jobs:
107112

108113
- name: Set Sample App Image
109114
run: |
110-
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
111-
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
115+
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
116+
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
112117
113118
- name: Set ADOT Java image environment variable
114119
run: |

‎.github/workflows/java-eks-canary.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ jobs:
3030
aws-region: ${{ matrix.aws-region }}
3131
test-cluster-name: 'e2e-canary-test'
3232
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
33+
java-version: '11'

‎.github/workflows/java-eks-retry.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ on:
1717
caller-workflow-name:
1818
required: true
1919
type: string
20+
java-version:
21+
required: true
22+
type: string
2023

2124
concurrency:
2225
group: 'java-eks-${{ inputs.aws-region }}-${{ github.ref_name }}'
@@ -34,6 +37,7 @@ jobs:
3437
aws-region: ${{ inputs.aws-region }}
3538
test-cluster-name: ${{ inputs.test-cluster-name }}
3639
caller-workflow-name: ${{ inputs.caller-workflow-name }}
40+
java-version: '11'
3741

3842
java-eks-attempt-2:
3943
needs: [ java-eks-attempt-1 ]
@@ -44,6 +48,7 @@ jobs:
4448
aws-region: ${{ inputs.aws-region }}
4549
test-cluster-name: ${{ inputs.test-cluster-name }}
4650
caller-workflow-name: ${{ inputs.caller-workflow-name }}
51+
java-version: '11'
4752

4853
publish-metric-attempt-1:
4954
needs: [ java-eks-attempt-1, java-eks-attempt-2 ]

‎.github/workflows/java-eks-test.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
caller-workflow-name:
1818
required: true
1919
type: string
20+
java-version:
21+
required: false
22+
type: string
23+
default: '11'
2024
adot-image-name:
2125
required: false
2226
type: string
@@ -37,6 +41,7 @@ env:
3741
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
3842
CLUSTER_NAME: ${{ inputs.test-cluster-name }}
3943
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
44+
JAVA_VERSION: ${{ inputs.java-version }}
4045
ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }}
4146
CW_AGENT_OPERATOR_TAG: ${{ inputs.cw-agent-operator-tag }}
4247
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
@@ -222,8 +227,8 @@ jobs:
222227

223228
- name: Set Sample App Image
224229
run: |
225-
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
226-
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
230+
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
231+
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
227232
228233
- name: Deploy sample app via terraform and wait for the endpoint to come online
229234
id: deploy-sample-app

0 commit comments

Comments
 (0)