From: Petr Ospalý <p.ospaly@partner.samsung.com>
Date: Fri, 6 Sep 2019 15:37:33 +0000 (+0200)
Subject: Remove noop code
X-Git-Tag: 6.0.0-ONAP~145^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=63651543d023ca7ba594f30c9b8aa7161f731dd2;p=integration%2Fcsit.git

Remove noop code

This commit removes one 2 minutes sleep which seems to be unnecessary
and removes copy-pasted "timeout" code from sdc's docker_run.sh which
also seems to be pointless and broken - the script fails to populate
variable which results in broken docker command and that triggers
pipefail if not disabled and if disabled then it just simply breaks
out of the loop in the first iteration.

Issue-ID: SDC-2558

Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Change-Id: I65f92c5fda5b126b8178382fc463c31e67029d5a
---

diff --git a/scripts/sdc/setup_sdc_for_sanity.sh b/scripts/sdc/setup_sdc_for_sanity.sh
index fc9f31b4..562c26d1 100644
--- a/scripts/sdc/setup_sdc_for_sanity.sh
+++ b/scripts/sdc/setup_sdc_for_sanity.sh
@@ -94,45 +94,7 @@ else
         -p 10001 -${TEST_SUITE}
 fi
 
-sleep 120
-
 # This file is sourced in another script which is out of our control...
 set +e
 set +o pipefail
 
-# The code below for example does nothing and breaks immediately (running locally at least)
-# Also it is very fragile: empty CID variable and broken docker command...
-
-#monitor test processes
-
-
-TIME_OUT=1200
-INTERVAL=20
-TIME=0
-CID=`docker ps | grep tests |  awk '{print $1}'`
-
-while [ "$TIME" -lt "$TIME_OUT" ]; do
-  
-PID=`docker exec -i $CID ps -ef | grep java | awk '{print $1}'`
-
-echo sanity PID is -- $PID
-  
-if [ -z "$PID" ]
- then
-    echo SDC sanity finished in $TIME seconds
-    break
-  fi
-
-  echo Sleep: $INTERVAL seconds before testing if SDC sanity completed. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
-  sleep $INTERVAL
-  TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]
- then
-   echo TIME OUT: SDC sanity was NOT completed in $TIME_OUT seconds... Could cause problems for tests...
-fi
-
-
-
-