Test

Author: harrryr

.github/workflows/actions/execute_and_retry/action.yml

@@ -1,7 +1,3 @@
-# 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: (Optional) Command for cleaning up resources if $2 fails
 name: Command Retry Logic
 
 inputs:
@@ -31,7 +27,6 @@ runs:
         PRE_COMMAND: ${{ inputs.pre-command }}
       run: |
         $PRE_COMMAND
-        pwd
 
     - name: Run command
       shell: bash
@@ -40,7 +35,6 @@ runs:
         COMMAND: ${{ inputs.command }}
         CLEANUP: ${{ inputs.cleanup }}
       run: |
-        pwd
         retry_counter=0
         while [ $retry_counter -lt $MAX_RETRY ]; do
         attempt_failed=0

.github/workflows/appsignals-e2e-ec2-test.yml

@@ -69,7 +69,7 @@ jobs:
         with:
           command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
           post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list \
-                         sudo apt update && sudo apt install terraform'
+          sudo apt update && sudo apt install terraform'
 
       - name: Initiate Terraform
         uses: ./.github/workflows/actions/execute_and_retry

.github/workflows/appsignals-e2e-eks-test.yml

@@ -123,7 +123,7 @@ jobs:
         with:
           command: "wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg"
           post-command: 'echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list \
-                         sudo apt update && sudo apt install terraform'
+          sudo apt update && sudo apt install terraform'
 
       - name: Initiate Terraform
         uses: ./.github/workflows/actions/execute_and_retry

.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

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # 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
@@ -26,8 +28,4 @@ execute_and_retry () {
   done
 }
 
-export -f execute_and_retry
-
-
-
-
+export -f execute_and_retry