Skip to content

Commit 262c5ed

Browse files
harrryrharrryr
committed
Test
1 parent 8b6e49e commit 262c5ed

File tree

6 files changed

+80
-10
lines changed

6 files changed

+80
-10
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ env:
3636
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
3737
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
3838
OTEL_SOURCE: ${{ inputs.otel-source }}
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
39+
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}-2/java-main-service-v${{ inputs.java-version }}.jar
40+
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}-2/java-remote-service-v${{ inputs.java-version }}.jar
4141
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
4242
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
4343
METRIC_NAMESPACE: ApplicationSignals
@@ -61,7 +61,7 @@ jobs:
6161

6262
- uses: actions/checkout@v4
6363
with:
64-
repository: 'aws-observability/aws-application-signals-test-framework'
64+
repository: 'harrryr/aws-application-signals-test-framework'
6565
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
6666
fetch-depth: 0
6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
6565
- uses: actions/checkout@v4
6666
with:
67-
repository: 'aws-observability/aws-application-signals-test-framework'
67+
repository: 'harrryr/aws-application-signals-test-framework'
6868
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
6969
fetch-depth: 0
7070

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
- uses: actions/checkout@v4
7171
with:
72-
repository: 'aws-observability/aws-application-signals-test-framework'
72+
repository: 'harrryr/aws-application-signals-test-framework'
7373
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
7474
fetch-depth: 0
7575

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
- uses: actions/checkout@v4
7070
with:
71-
repository: 'aws-observability/aws-application-signals-test-framework'
71+
repository: 'harrryr/aws-application-signals-test-framework'
7272
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
7373
fetch-depth: 0
7474

@@ -122,8 +122,8 @@ jobs:
122122
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
123123
sed -i 's#\${TESTING_ID}#${{ env.TESTING_ID }}#' remote-service-depl.yaml
124124
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
125-
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
126-
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
125+
aws s3api put-object --bucket aws-appsignals-sample-app-prod-${{ env.E2E_TEST_AWS_REGION }}-2 --key frontend-service-depl-${{ env.TESTING_ID }}.yaml --body frontend-service-depl.yaml
126+
aws s3api put-object --bucket aws-appsignals-sample-app-prod-${{ env.E2E_TEST_AWS_REGION }}-2 --key remote-service-depl-${{ env.TESTING_ID }}.yaml --body remote-service-depl.yaml
127127
128128
- name: Set up terraform
129129
uses: ./.github/workflows/actions/execute_and_retry

‎.github/workflows/test.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
## This workflow aims to run the Application Signals end-to-end tests as a canary to
5+
## test the artifacts for App Signals enablement. It will deploy a sample app and remote
6+
## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
7+
## including logs, metrics, and traces.
8+
name: Java EKS Enablement Canary Testing
9+
on:
10+
push:
11+
12+
permissions:
13+
id-token: write
14+
contents: read
15+
16+
jobs:
17+
eks:
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
aws-region: ['us-east-1']
22+
uses: ./.github/workflows/java-eks-retry.yml
23+
secrets: inherit
24+
with:
25+
aws-region: ${{ matrix.aws-region }}
26+
test-cluster-name: 'e2e-canary-test'
27+
caller-workflow-name: 'appsignals-e2e-eks-canary-test'
28+
java-version: '11'
29+
30+
k8s:
31+
uses: ./.github/workflows/java-k8s-retry.yml
32+
secrets: inherit
33+
with:
34+
# To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
35+
aws-region: 'us-east-1'
36+
caller-workflow-name: 'appsignals-e2e-k8s-canary-test'
37+
java-version: '11'
38+
39+
ecs:
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
aws-region: ['us-east-1']
44+
uses: ./.github/workflows/java-ecs-retry.yml
45+
secrets: inherit
46+
with:
47+
aws-region: ${{ matrix.aws-region }}
48+
caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test'
49+
java-version: '11'
50+
51+
github:
52+
strategy:
53+
fail-fast: false
54+
matrix:
55+
aws-region: ['us-east-1']
56+
uses: ./.github/workflows/java-ec2-default-retry.yml
57+
secrets: inherit
58+
with:
59+
aws-region: ${{ matrix.aws-region }}
60+
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
61+
java-version: '11'
62+
63+
maven:
64+
uses: ./.github/workflows/java-ec2-default-retry.yml
65+
secrets: inherit
66+
with:
67+
aws-region: 'us-east-1'
68+
caller-workflow-name: 'appsignals-e2e-ec2-maven-canary-test'
69+
otel-source: 'maven'
70+
java-version: '11'

‎terraform/java/k8s/deploy/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ resource "null_resource" "deploy" {
119119
120120
# cd to ensure everything is downloaded into root directory so cleanup is each
121121
cd ~
122-
aws s3api get-object --bucket aws-appsignals-sample-app-prod-us-east-1 --key frontend-service-depl-${var.test_id}.yaml frontend-service-depl.yaml
123-
aws s3api get-object --bucket aws-appsignals-sample-app-prod-us-east-1 --key remote-service-depl-${var.test_id}.yaml remote-service-depl.yaml
122+
aws s3api get-object --bucket aws-appsignals-sample-app-prod-us-east-1-2 --key frontend-service-depl-${var.test_id}.yaml frontend-service-depl.yaml
123+
aws s3api get-object --bucket aws-appsignals-sample-app-prod-us-east-1-2 --key remote-service-depl-${var.test_id}.yaml remote-service-depl.yaml
124124
125125
# Patch the staging image if this is running as part of release testing
126126
if [ "${var.repository}" = "aws-otel-java-instrumentation" ]; then

0 commit comments

Comments
 (0)