From: kaihlavi <l.kaihlavirt@partner.samsung.com>
Date: Tue, 21 May 2019 13:38:53 +0000 (+0300)
Subject: Combine similar SDC setup scripts into one
X-Git-Tag: 6.0.0-ONAP~293
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b6f2ac350d36cf7cc22e0c6e02804d7aa82d77eb;p=integration%2Fcsit.git

Combine similar SDC setup scripts into one

 Replace almost identical setup scripts for SDC api and ui tests
 with one that takes the wanted SDC test suite as an argument

Change-Id: Ic48ffa82a41d80da860eb043e3dfb71f55cc08ad
Issue-ID: INT-1084
Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>
---

diff --git a/plans/sdc/nightly/setup.sh b/plans/sdc/nightly/setup.sh
index ff310a5a..7587d096 100644
--- a/plans/sdc/nightly/setup.sh
+++ b/plans/sdc/nightly/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
diff --git a/plans/sdc/sanity/setup.sh b/plans/sdc/sanity/setup.sh
index ff310a5a..7587d096 100644
--- a/plans/sdc/sanity/setup.sh
+++ b/plans/sdc/sanity/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
diff --git a/plans/sdc/uiSanity/setup.sh b/plans/sdc/uiSanity/setup.sh
index 0a8d56c0..863f8d4d 100644
--- a/plans/sdc/uiSanity/setup.sh
+++ b/plans/sdc/uiSanity/setup.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_ui_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tud
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
 
-
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v BE_IP:${BE_IP}"
 
diff --git a/scripts/sdc/setup_sdc_for_apis_sanity.sh b/scripts/sdc/setup_sdc_for_sanity.sh
similarity index 79%
rename from scripts/sdc/setup_sdc_for_apis_sanity.sh
rename to scripts/sdc/setup_sdc_for_sanity.sh
index c1442d1f..79708c58 100644
--- a/scripts/sdc/setup_sdc_for_apis_sanity.sh
+++ b/scripts/sdc/setup_sdc_for_sanity.sh
@@ -1,10 +1,23 @@
 #!/bin/bash
 
+function usage {
+    echo "usage: setup_sdc_for_sanity.sh {tad|tud}"
+    echo "setup sdc and run api test suite: setup_sdc_for_sanity.sh tad"
+    echo "setup sdc and run ui test suite: setup_sdc_for_sanity.sh tud"
+}
+
+
 set -x
 
-echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh"
+
+
+if [ "$1" != "tad" ] && [ "$1" != "tud" ]; then
+    usage
+    exit 1
+fi
 
-# Clone sdc enviroment template 
+# Clone sdc enviroment template
 mkdir -p ${WORKSPACE}/data/environments/
 mkdir -p ${WORKSPACE}/data/clone/
 #mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE
@@ -12,7 +25,6 @@ mkdir -p ${WORKSPACE}/data/clone/
 #chmod -R 777 ${WORKSPACE}/data/logs
 #ls -lR ${WORKSPACE}/data/logs/
 
-
 cd ${WORKSPACE}/data/clone
 git clone --depth 1 http://gerrit.onap.org/r/sdc -b ${GERRIT_BRANCH}
 
@@ -22,13 +34,14 @@ chmod -R 777 ${WORKSPACE}/data/clone
 
 export ENV_NAME='CSIT'
 export MR_IP_ADDR='10.0.0.1'
+export TEST_SUITE=$1
 
 ifconfig
 IP_ADDRESS=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'`
 export HOST_IP=$IP_ADDRESS
 
 # setup enviroment json
-   
+
 cat ${WORKSPACE}/data/clone/sdc/sdc-os-chef/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > ${WORKSPACE}/data/environments/$ENV_NAME.json
 sed -i "s/xxx/"$ENV_NAME"/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
 sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
@@ -37,8 +50,8 @@ sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" ${WORK
   
 source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
-export DEP_ENV=$ENV_NAME  
-  
+export DEP_ENV=$ENV_NAME
+
 cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
 #sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh
 #sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
@@ -47,11 +60,11 @@ cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/sc
 source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
 
-${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tad
+${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -${TEST_SUITE}
 
 sleep 120
 
-#monitor test processes 
+#monitor test processes
 
 TIME_OUT=1200
 INTERVAL=20
@@ -77,7 +90,7 @@ done
 
 if [ "$TIME" -ge "$TIME_OUT" ]
  then
-   echo TIME OUT: Sany was NOT completed in $TIME_OUT seconds... Could cause problems for tests...
+   echo TIME OUT: SDC sanity was NOT completed in $TIME_OUT seconds... Could cause problems for tests...
 fi
 
 
diff --git a/scripts/sdc/setup_sdc_for_ui_sanity.sh b/scripts/sdc/setup_sdc_for_ui_sanity.sh
deleted file mode 100644
index 6f8a2328..00000000
--- a/scripts/sdc/setup_sdc_for_ui_sanity.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-set -x
-
-echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh"
-
-# Clone sdc enviroment template 
-mkdir -p ${WORKSPACE}/data/environments/
-mkdir -p ${WORKSPACE}/data/clone/
-#mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE
-#mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE
-#chmod -R 777 ${WORKSPACE}/data/logs
-#ls -lR ${WORKSPACE}/data/logs/
-
-
-cd ${WORKSPACE}/data/clone
-git clone --depth 1 http://gerrit.onap.org/r/sdc -b ${GERRIT_BRANCH}
-
-chmod -R 777 ${WORKSPACE}/data/clone
-
-# set enviroment variables
-
-export ENV_NAME='CSIT'
-export MR_IP_ADDR='10.0.0.1'
-
-ifconfig
-IP_ADDRESS=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'`
-export HOST_IP=$IP_ADDRESS
-
-# setup enviroment json
-   
-cat ${WORKSPACE}/data/clone/sdc/sdc-os-chef/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > ${WORKSPACE}/data/environments/$ENV_NAME.json
-sed -i "s/xxx/"$ENV_NAME"/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
-sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
-sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
-
-  
-source ${WORKSPACE}/data/clone/sdc/version.properties
-export RELEASE=$major.$minor-STAGING-latest
-export DEP_ENV=$ENV_NAME  
-  
-cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
-#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh
-#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
-#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
-
-source ${WORKSPACE}/data/clone/sdc/version.properties
-export RELEASE=$major.$minor-STAGING-latest
-
-${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tud
-
-sleep 120
-
-#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: Sany was NOT completed in $TIME_OUT seconds... Could cause problems for tests...
-fi
-
-
-
-