Skip to content

Commit 89703b2

Browse files
harrryrharrryr
committed
Test
1 parent 32daf72 commit 89703b2

File tree

2 files changed

+130
-3
lines changed

2 files changed

+130
-3
lines changed

‎.github/workflows/test.yml

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
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 on two EC2 instances, call the APIs, and validate the generated telemetry,
7+
## including logs, metrics, and traces.
8+
name: Test
9+
on:
10+
workflow_dispatch:
11+
push:
12+
13+
permissions:
14+
id-token: write
15+
contents: read
16+
17+
jobs:
18+
# java-eks:
19+
# strategy:
20+
# fail-fast: false
21+
# matrix:
22+
# aws-region: [ 'us-east-1' ]
23+
# uses: ./.github/workflows/java-eks-e2e-test.yml
24+
# secrets: inherit
25+
# with:
26+
# aws-region: ${{ matrix.aws-region }}
27+
# test-cluster-name: 'e2e-playground'
28+
# caller-workflow-name: 'test'
29+
#
30+
# python-eks:
31+
# needs: java-eks
32+
# strategy:
33+
# fail-fast: false
34+
# matrix:
35+
# aws-region: [ 'us-east-1' ]
36+
# uses: ./.github/workflows/python-eks-e2e-test.yml
37+
# secrets: inherit
38+
# with:
39+
# aws-region: ${{ matrix.aws-region }}
40+
# test-cluster-name: 'e2e-playground'
41+
# caller-workflow-name: 'test'
42+
#
43+
# metric-limiter:
44+
# needs: python-eks
45+
# strategy:
46+
# fail-fast: false
47+
# matrix:
48+
# aws-region: [ 'us-east-1' ]
49+
# uses: ./.github/workflows/java-metric-limiter-e2e-test.yml
50+
# secrets: inherit
51+
# with:
52+
# aws-region: ${{ matrix.aws-region }}
53+
# test-cluster-name: 'e2e-playground'
54+
# caller-workflow-name: 'test'
55+
#
56+
# default:
57+
# strategy:
58+
# fail-fast: false
59+
# matrix:
60+
# aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
61+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
62+
# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
63+
# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2']
64+
# uses: ./.github/workflows/java-ec2-default-e2e-test.yml
65+
# secrets: inherit
66+
# with:
67+
# aws-region: ${{ matrix.aws-region }}
68+
# caller-workflow-name: 'test'
69+
#
70+
# asg:
71+
# strategy:
72+
# fail-fast: false
73+
# matrix:
74+
# aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
75+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
76+
# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
77+
# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2']
78+
# uses: ./.github/workflows/java-ec2-asg-e2e-test.yml
79+
# secrets: inherit
80+
# with:
81+
# aws-region: ${{ matrix.aws-region }}
82+
# caller-workflow-name: 'test'
83+
#
84+
# python-default:
85+
# strategy:
86+
# fail-fast: false
87+
# matrix:
88+
# aws-region: [ 'af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
89+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
90+
# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
91+
# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2' ]
92+
# uses: ./.github/workflows/python-ec2-default-e2e-test.yml
93+
# secrets: inherit
94+
# with:
95+
# aws-region: ${{ matrix.aws-region }}
96+
# caller-workflow-name: 'test'
97+
#
98+
# python-asg:
99+
# strategy:
100+
# fail-fast: false
101+
# matrix:
102+
# aws-region: [ 'af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
103+
# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
104+
# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
105+
# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2' ]
106+
# uses: ./.github/workflows/python-ec2-asg-e2e-test.yml
107+
# secrets: inherit
108+
# with:
109+
# aws-region: ${{ matrix.aws-region }}
110+
# caller-workflow-name: 'test'
111+
112+
java-k8s:
113+
uses: ./.github/workflows/java-k8s-e2e-test.yml
114+
secrets: inherit
115+
with:
116+
# To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
117+
aws-region: 'us-east-1'
118+
caller-workflow-name: 'test'
119+
120+
python-k8s:
121+
needs: java-k8s
122+
uses: ./.github/workflows/python-k8s-e2e-test.yml
123+
secrets: inherit
124+
with:
125+
# To run in more regions, a cluster must be provisioned manually on EC2 instances in that region
126+
aws-region: 'us-east-1'
127+
caller-workflow-name: 'test'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ resource "null_resource" "deploy" {
144144
aws ssm put-parameter --region ${var.aws_region} --name main-service-ip-${var.test_id} --type String --overwrite --value $(kubectl get pods -n sample-app-namespace --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}')
145145
aws ssm put-parameter --region ${var.aws_region} --name remote-service-ip-${var.test_id} --type String --overwrite --value $(kubectl get pod --selector=app=remote-app -n sample-app-namespace -o jsonpath='{.items[0].status.podIP}')
146146
147+
# Wait a bit more in case the sample apps aren't ready yet
148+
sleep 30
149+
147150
# Deploy the traffic generator
148151
kubectl create deployment -n sample-app-namespace traffic-generator \
149152
--image=$ACCOUNT.dkr.ecr.${var.aws_region}.amazonaws.com/e2e-test-resource:traffic-generator \
@@ -157,9 +160,6 @@ resource "null_resource" "deploy" {
157160
kubectl set env -n sample-app-namespace deployment/traffic-generator MAIN_ENDPOINT=$(kubectl get pods -n sample-app-namespace --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}'):8080
158161
kubectl set env -n sample-app-namespace deployment/traffic-generator REMOTE_ENDPOINT=$(kubectl get pod --selector=app=remote-app -n sample-app-namespace -o jsonpath='{.items[0].status.podIP}')
159162
kubectl set env -n sample-app-namespace deployment/traffic-generator ID=${var.test_id}
160-
161-
# Restart the traffic generator with the new configuration
162-
kubectl get pods -n sample-app-namespace --no-headers | grep '^traffic-generator' | awk '{print $1}' | xargs kubectl delete pod -n sample-app-namespace
163163
164164
sleep 10
165165

0 commit comments

Comments
 (0)