From 7efb52b96f0ef1921a4a81986e7282b0035708cd Mon Sep 17 00:00:00 2001
From: ykim-1 <ykim@akamai.com>
Date: Tue, 25 Jun 2024 09:07:44 -0700
Subject: [PATCH] gha test 1

---
 Makefile            |  4 ++--
 e2e_scripts         |  2 +-
 scripts/test_all.sh | 21 ++++++---------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 351536165..5d9f61557 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ integration-test: create-integration-config create-e2e-firewall
 
 create-e2e-firewall:
 	@echo "Running create e2e firewall playbook..."
-	@if e2e_scripts/cloud_security_scripts/cloud_e2e_firewall/ansible_linode/create_e2e_cloud_firewall.yaml > /dev/null; then \
+	@if ansible-playbook e2e_scripts/cloud_security_scripts/cloud_e2e_firewall/ansible_linode/create_e2e_cloud_firewall.yaml > /dev/null; then \
 		echo "Successfully created e2e firewall"; \
 	else \
 		echo "Failed to create e2e firewall"; \
@@ -74,7 +74,7 @@ create-e2e-firewall:
 
 delete-e2e-firewall:
 	@echo "Running delete e2e firewall playbook..."
-	@if e2e_scripts/cloud_security_scripts/cloud_e2e_firewall/ansible_linode/delete_e2e_cloud_firewall.yaml  > /dev/null; then \
+	@if ansible-playbook e2e_scripts/cloud_security_scripts/cloud_e2e_firewall/ansible_linode/delete_e2e_cloud_firewall.yaml  > /dev/null; then \
 		echo "Successfully deleted e2e firewall"; \
 	else \
 		echo "Failed to delete e2e firewall"; \
diff --git a/e2e_scripts b/e2e_scripts
index 9240a1678..2cb11f4fe 160000
--- a/e2e_scripts
+++ b/e2e_scripts
@@ -1 +1 @@
-Subproject commit 9240a16787de5ca7cbcebdd2eab5d597e8ba01c1
+Subproject commit 2cb11f4fee6ae74e6811f3e03db2567dee645a38
diff --git a/scripts/test_all.sh b/scripts/test_all.sh
index 251c76ec6..6319cb47b 100755
--- a/scripts/test_all.sh
+++ b/scripts/test_all.sh
@@ -3,7 +3,7 @@
 PARALLEL_JOBS="${PARALLEL_JOBS:=3}"
 
 run_test() {
-    ANSIBLE_RETRY_FILES_ENABLED=false ansible-test integration $(TEST_ARGS)
+    ANSIBLE_RETRY_FILES_ENABLED=false ansible-test integration $1
 }
 
 cleanup() {
@@ -17,24 +17,15 @@ cleanup() {
 trap cleanup EXIT
 
 # Create integration_yaml
-if ! make create-integration-config; then
-    echo "Failed to create integration config..."
-    exit 1
-fi
-
-if ! make create-e2e-firewall; then
-    echo "Failed to create e2e firewall..."
-    exit 1
-fi
+make create-integration-config
+make create-e2e-firewall
 
 export -f run_test
 
 # Run tests in parallel
-if ! parallel -j $PARALLEL_JOBS --group --keep-order run_test ::: $(ls tests/integration/targets); then
-    TEST_EXIT_CODE=$?
-else
-    TEST_EXIT_CODE=0
-fi
+parallel -j $PARALLEL_JOBS --group --keep-order run_test ::: $(ls tests/integration/targets)
+TEST_EXIT_CODE=$?
+
 
 cleanup