Add support for https tests for SDC-DCAE-D
This commit introduces a new set of variables for sdc-dcae-d test in the
same style as was for sdc tests. Some refactor had to be done to make it
work and make it less copy-pasted.
Issue-ID: SDC-2564
Change-Id: Ic0725dbc4643d0563594f28d2a772968e291f788
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
diff --git a/scripts/sdc-dcae-d/setup_sdc_dcaed.sh b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
index 0bfc7e0..9abc081 100644
--- a/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
+++ b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
@@ -15,43 +15,33 @@
# limitations under the License.
#
-set -x
-
echo "This is ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh"
-# Clone sdc enviroment template
-mkdir -p ${WORKSPACE}/data/environments/
-mkdir -p ${WORKSPACE}/data/clone/
-cd ${WORKSPACE}/data/clone
-git clone --depth 1 http://gerrit.onap.org/r/sdc/dcae-d/dt-be-main
-git clone --depth 1 http://gerrit.onap.org/r/sdc
+# I am leaving this here for explicity - but the same is already set inside setup sdc...
+export ENV_NAME='CSIT'
-chmod -R 777 ${WORKSPACE}/data/clone
+# run sdc deployment
+set -- # to wipe out arguments...
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh
+export ROBOT_VARIABLES
+
+# fail quick if error
+set -exo pipefail
+
+# prepare dcae-d
+mkdir -p "${WORKSPACE}/data/clone/"
+cd "${WORKSPACE}/data/clone"
+git clone --depth 1 "https://gerrit.onap.org/r/sdc/dcae-d/dt-be-main"
# set enviroment variables
-
-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
-
-source ${WORKSPACE}/data/clone/sdc/version.properties
-export RELEASE=$major.$minor-STAGING-latest
source ${WORKSPACE}/data/clone/dt-be-main/version.properties
export DCAE_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-dcae-d/
cp ${WORKSPACE}/data/clone/dt-be-main/docker/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc-dcae-d/dcaed_docker_run.sh
-${WORKSPACE}/scripts/sdc-dcae-d/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001
${WORKSPACE}/scripts/sdc-dcae-d/dcaed_docker_run.sh -r ${DCAE_RELEASE} -e ${ENV_NAME} -p 10001
+# This file is sourced in another script which is out of our control...
+set +e
+set +o pipefail
diff --git a/scripts/sdc/setup_sdc_for_sanity.sh b/scripts/sdc/setup_sdc_for_sanity.sh
index dba6eb5..c5a923d 100644
--- a/scripts/sdc/setup_sdc_for_sanity.sh
+++ b/scripts/sdc/setup_sdc_for_sanity.sh
@@ -1,9 +1,20 @@
#!/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"
+cat <<EOF
+USAGE
+ setup_sdc_for_sanity.sh [tad|tud]
+
+EXAMPLES
+ setup_sdc_for_sanity.sh
+ just setup sdc component (containers)
+
+ setup_sdc_for_sanity.sh tad
+ setup sdc and run api test suite
+
+ setup_sdc_for_sanity.sh tud
+ setup sdc and run ui test suite
+EOF
}
# arg: <variable name>
@@ -38,11 +49,24 @@
echo "This is ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh"
+ENABLE_SIMULATOR=
+case "$1" in
+ tad|tud)
+ # enable test
+ export TEST_SUITE="-${1}"
+ ;;
+ '')
+ # we will just setup sdc - no tests
+ export TEST_SUITE=""
-if [ "$1" != "tad" ] && [ "$1" != "tud" ]; then
- usage
- exit 1
-fi
+ # this is mandatory
+ ENABLE_SIMULATOR="--simulator"
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+esac
# Clone sdc enviroment template
mkdir -p "${WORKSPACE}/data/environments/"
@@ -59,7 +83,7 @@
exit 1
fi
else
- git clone --depth 1 http://gerrit.onap.org/r/sdc -b ${GERRIT_BRANCH}
+ git clone --depth 1 "https://gerrit.onap.org/r/sdc" -b ${GERRIT_BRANCH}
fi
# TODO: why?
@@ -69,7 +93,6 @@
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 }'`
@@ -111,13 +134,13 @@
--local \
-r "${RELEASE}" \
-e "${ENV_NAME}" \
- -p 10001 "-${TEST_SUITE}"
+ -p 10001 ${TEST_SUITE} ${ENABLE_SIMULATOR}
else
echo "[INFO]: We will download images from the default registry (tag: ${RELEASE})"
${WORKSPACE}/scripts/sdc/docker_run.sh \
-r "${RELEASE}" \
-e "${ENV_NAME}" \
- -p 10001 "-${TEST_SUITE}"
+ -p 10001 ${TEST_SUITE} ${ENABLE_SIMULATOR}
fi
# final step if the robot test needs to be adjusted