Move archiving of logs to teardown for k6 tests

Issue-ID: CPS-3134
Change-Id: Idded07b58c13d15b1994e57c4f8221ecd5932651
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>

diff --git a/k6-tests/k6-main.sh b/k6-tests/k6-main.sh
index 0db1c3a..8e49702 100755 (executable)
--- a/k6-tests/k6-main.sh
+++ b/k6-tests/k6-main.sh
@@ -26,18 +26,10 @@ testProfile=${1:-kpi}
 # The default deployment type is dockerCompose
 deploymentType=${2:-dockerHosts}
 
-# Function to create and store logs
-make_logs() {
-  echo "Creating logs for deployment type: $deploymentType"
-  chmod +x archive-logs.sh
-  ./archive-logs.sh "$deploymentType"
-}
-
 # Cleanup handler: capture exit status, run teardown,
 # and restore directory, report failures, and exit with original code.
 on_exit() {
   rc=$?
-  make_logs
   popd
   echo "TEST FAILURES: $rc"
   exit $rc

diff --git a/k6-tests/teardown.sh b/k6-tests/teardown.sh
index 88e79ca..4188b10 100755 (executable)
--- a/k6-tests/teardown.sh
+++ b/k6-tests/teardown.sh
@@ -48,14 +48,18 @@ remove_cps_images() {
   done
 }
 
+# Function to create and store logs
+make_logs() {
+  echo "Creating logs for deployment type: $deploymentType"
+  chmod +x archive-logs.sh
+  ./archive-logs.sh "$deploymentType"
+}
+
 # Function to teardown docker-compose deployment
 teardown_docker_deployment() {
   echo '================================== docker info =========================='
   docker ps -a
 
-  # Zip and store logs for the containers
-  make_logs "dockerHosts"
-
   local docker_compose_shutdown_cmd="docker-compose -f ../docker-compose/docker-compose.yml --project-name $testProfile down --volumes"
 
   # Check env. variable CLEAN_DOCKER_IMAGES=1 to decide removing CPS images
@@ -78,7 +82,8 @@ teardown_k8s_deployment() {
   clean_docker_images_if_needed
 }
 
-# Main logic: determine which deployment type to teardown
+# Main logic: archive logs and determine which deployment type to teardown
+make_logs
 case "$deploymentType" in
   "k8sHosts")
     teardown_k8s_deployment