Test

Author: harrryr

.github/workflows/test.yml

@@ -0,0 +1,38 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals end-to-end tests as a canary to
+## test the artifacts for App Signals enablement. It will deploy a sample app and remote
+## service on two EC2 instances, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Test
+on:
+  push:
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  e2e-ec2-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/appsignals-e2e-ec2-test.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      caller-workflow-name: 'test'
+
+  e2e-eks-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/appsignals-e2e-eks-test.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-playground'
+      caller-workflow-name: "test"

.github/workflows/util/execute_and_retry.sh

@@ -3,16 +3,18 @@
 # This function is for retrying commands in the case they fail. It accepts three arguments
 # $1: Number of retries it will attempt
 # $2: Command to execute
-# $3: Clean up commands
+# $3: (Optional) Command for cleaning up resources if $2 fails
 execute_and_retry () {
   retry_counter=0
   max_retry=$1
+  command=$2
+  cleanup=$3
   while [ $retry_counter -lt $max_retry ]; do
    attempt_failed=0
-   eval "$2" || attempt_failed=$?
+   eval "$command" || attempt_failed=$?
 
    if [ $attempt_failed -ne 0 ]; then
-     eval "$3"
+     eval "$cleanup"
      retry_counter=$(($retry_counter+1))
      sleep 5
    else