From 06b02fd40ab6267ae457758985d962f7db0e9444 Mon Sep 17 00:00:00 2001
From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Fri, 20 Nov 2020 14:21:27 +0200
Subject: [PATCH] Archive results under plan-specific directory

 - store the results of the execution under plan-specific folder
   under archives instead of directly under it to support multiple
   plan executions in one run
 - trivial output changes to CCSDK healthcheck to trigger it to
   verify this change
 - note that this verification shall not pass until
   https://gerrit.onap.org/r/c/ci-management/+/115175 is merged!

Issue-ID: INT-1786
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I7fbdd38312bcc13409065957fdb1b01712ac8abc
---
 plans/ccsdk/healthcheck/setup.sh |  2 +-
 run-csit.sh                      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plans/ccsdk/healthcheck/setup.sh b/plans/ccsdk/healthcheck/setup.sh
index 6a3841ec..2a5ef4db 100644
--- a/plans/ccsdk/healthcheck/setup.sh
+++ b/plans/ccsdk/healthcheck/setup.sh
@@ -64,7 +64,7 @@ docker exec ccsdk_odlsli_container cat /opt/opendaylight/data/log/karaf.log | gr
     break;
   fi
 
-  echo Sleep: $INTERVAL seconds before testing if CCSDK is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
+  echo Sleep $INTERVAL seconds before testing if CCSDK is up. Total wait time up until now is $TIME seconds. Timeout is $TIME_OUT seconds
   sleep $INTERVAL
   TIME=$(($TIME+$INTERVAL))
 done
diff --git a/run-csit.sh b/run-csit.sh
index 52d16932..ce9cf80f 100755
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -26,13 +26,13 @@ function on_exit(){
     rc=$?
     if [[ ${WORKSPACE} ]]; then
         if [[ ${WORKDIR} ]]; then
-            rsync -av "$WORKDIR/" "$WORKSPACE/archives"
+            rsync -av "$WORKDIR/" "$WORKSPACE/archives/$TESTPLAN"
         fi
         # Record list of active docker containers
-        docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log"
+        docker ps --format "{{.Image}}" > "$WORKSPACE/archives/$TESTPLAN/_docker-images.log"
 
         # show memory consumption after all docker instances initialized
-        docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt"
+        docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-2-after-robot.txt"
     fi
     # Run teardown script plan if it exists
     cd "${TESTPLANDIR}"
@@ -135,9 +135,6 @@ if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=$(git rev-parse --show-toplevel)
 fi
 
-rm -rf "$WORKSPACE/archives"
-mkdir -p "$WORKSPACE/archives"
-
 if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then
     export TESTPLAN="${1}"
 else
@@ -147,6 +144,9 @@ fi
 
 export TESTOPTIONS="${2}"
 
+rm -rf "$WORKSPACE/archives/$TESTPLAN"
+mkdir -p "$WORKSPACE/archives/$TESTPLAN"
+
 TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
 
 # Run installation of prerequired libraries
@@ -175,7 +175,7 @@ if [ -f "${SETUP}" ]; then
 fi
 
 # show memory consumption after all docker instances initialized
-docker_stats | tee "$WORKSPACE/archives/_sysinfo-1-after-setup.txt"
+docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-1-after-setup.txt"
 
 # Run test plan
 cd "$WORKDIR"
-- 
2.16.6