Skip to content

Commit f746e89

Browse files
authored
Merge pull request #54 from aws-observability/update-metric-limiter-test
Update Metric Limiter Workflow Name and Add to All Region
2 parents e9f4e07 + 3f9137d commit f746e89

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.github/workflows/appsignals-e2e-metric-limiter-canary-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## Operator and our sample app and remote service onto a native K8s cluster, call the
77
## APIs, and validate the generated telemetry, including logs, metrics, and traces.
88
## It will then clean up the cluster and EC2 instance it runs on for the next test run.
9-
name: App Signals Enablement - E2E K8s Canary Testing
9+
name: App Signals Enablement - E2E Metric Limiter Canary Testing
1010
on:
1111
schedule:
1212
- cron: '*/15 * * * *' # run the workflow every 15 minutes
@@ -17,11 +17,14 @@ permissions:
1717
contents: read
1818

1919
jobs:
20-
e2e-eks-test-1:
20+
e2e-metric-limiter-test-1:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
aws-region: ['us-east-1']
24+
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',
25+
'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
26+
'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',
27+
'us-east-1','us-east-2','us-west-1','us-west-2' ]
2528
uses: ./.github/workflows/appsignals-e2e-metric-limiter-test.yml
2629
secrets: inherit
2730
with:

.github/workflows/appsignals-e2e-metric-limiter-test.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This is a reusable workflow for running the E2E test for App Signals.
55
# It is meant to be called from another workflow.
66
# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview
7-
name: App Signals Enablement E2E Testing - EKS
7+
name: App Signals Enablement E2E Testing - Metric Limiter
88
on:
99
workflow_call:
1010
inputs:
@@ -14,9 +14,6 @@ on:
1414
test-cluster-name:
1515
required: true
1616
type: string
17-
appsignals-adot-image-name:
18-
required: false
19-
type: string
2017
caller-workflow-name:
2118
required: true
2219
type: string
@@ -41,7 +38,7 @@ env:
4138
TEST_RESOURCES_FOLDER: /__w/aws-application-signals-test-framework/aws-application-signals-test-framework
4239

4340
jobs:
44-
e2e-eks-test:
41+
e2e-metric-limiter-test:
4542
runs-on: ubuntu-latest
4643
container:
4744
image: public.ecr.aws/h6o3z5z9/aws-application-signals-test-framework-workflow-container:latest
@@ -120,6 +117,7 @@ jobs:
120117
with:
121118
command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/eks && terraform init && terraform validate"
122119
cleanup: "rm -rf .terraform && rm -rf .terraform.lock.hcl"
120+
sleep_time: 60
123121

124122
- name: Deploy sample app via terraform and wait for the endpoint to come online
125123
id: deploy-sample-app
@@ -283,6 +281,14 @@ jobs:
283281
curl -S -s http://${{ env.APP_ENDPOINT }}/remote-service?ip=${{ env.REMOTE_SERVICE_POD_IP }}/; echo
284282
curl -S -s http://${{ env.APP_ENDPOINT }}/client-call/; echo
285283
284+
- name: Initiate Gradlew Daemon
285+
uses: ./.github/workflows/actions/execute_and_retry
286+
with:
287+
command: "./gradlew"
288+
cleanup: "./gradlew clean"
289+
max_retry: 4
290+
sleep_time: 30
291+
286292
- name: Call endpoints and validate generated metrics
287293
id: other-operation-metric-validation
288294
if: steps.deploy-sample-app.outcome == 'success' && !cancelled()

0 commit comments

Comments
 (0)