From 1d55a4db78576e238a06aa53d519fec16fe03698 Mon Sep 17 00:00:00 2001
From: waynedunican <wayne.dunican@est.tech>
Date: Mon, 20 Jan 2025 08:34:16 +0000
Subject: Update S3P trigger script

Issue-ID: POLICY-5148
Change-Id: I82173b73614a8a3a3df30c19988436a9b9f05a52
Signed-off-by: waynedunican <wayne.dunican@est.tech>
---
 testsuites/run-s3p-test.sh | 58 +++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/testsuites/run-s3p-test.sh b/testsuites/run-s3p-test.sh
index 942bdf456..36ea884c6 100755
--- a/testsuites/run-s3p-test.sh
+++ b/testsuites/run-s3p-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2023-2024 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023-2025 Nordix Foundation. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,27 +22,43 @@ if [ -z "${WORKSPACE}" ]; then
     export WORKSPACE=$(git rev-parse --show-toplevel)
 fi
 
+export PROJECT="apex-pdp"
 export TESTDIR=${WORKSPACE}/testsuites
 export APEX_PERF_TEST_FILE=$TESTDIR/performance/performance-benchmark-test/src/main/resources/apexPdpPerformanceTestPlan.jmx
 export APEX_STAB_TEST_FILE=$TESTDIR/apex-pdp-stability/src/main/resources/apexPdpStabilityTestPlan.jmx
 
-if [ $1 == "run" ]
-then
-
-  mkdir automate-s3p-test;cd automate-s3p-test;
-  git clone "https://gerrit.onap.org/r/policy/docker"
-  cd docker/csit
-
-  if [ $2 == "performance" ]
-  then
-    bash start-s3p-tests.sh run $APEX_PERF_TEST_FILE apex-pdp;
-  elif [ $2 == "stability" ]
-  then
-    bash start-s3p-tests.sh run $APEX_STAB_TEST_FILE apex-pdp;
-  else
-    echo "echo Invalid arguments provided. Usage: $0 [option..] {performance | stability}"
-  fi
-
-else
-  echo "Invalid arguments provided. Usage: $0 [option..] {run | uninstall}"
-fi
+function run_tests() {
+    local test_file=$1
+
+    mkdir -p automate-s3p-test
+    cd automate-s3p-test || exit 1
+    git clone "https://gerrit.onap.org/r/policy/docker"
+    cd docker/csit || exit 1
+
+    bash run-s3p-tests.sh test "$test_file" $PROJECT
+}
+
+function clean() {
+    cd $TESTDIR/automate-s3p-test/docker/csit
+    bash run-s3p-tests.sh clean
+}
+
+echo "================================="
+echo "Triggering S3P test for: $PROJECT"
+echo "================================="
+
+case $1 in
+    performance)
+        run_tests "$APEX_PERF_TEST_FILE"
+        ;;
+    stability)
+        run_tests "$APEX_STAB_TEST_FILE"
+        ;;
+    clean)
+        clean
+        ;;
+    *)
+        echo "Invalid arguments provided. Usage: $0 {performance | stability | clean}"
+        exit 1
+        ;;
+
-- 
cgit 1.2.3-korg