aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-11-24 16:51:28 +0800
committerzhihui wu <wu.zhihui1@zte.com.cn>2017-11-24 16:51:28 +0800
commitf9a4031c4e8146c350065878b95cd40d81aa4fe7 (patch)
tree42fdc6806d6beb866ad5d2bccc6c9cee4f583c40
parent717a05251f782d81a1658d65e7f78092d9f4b566 (diff)
distinguish fuel and mcp in ci scripts
Because ci parameter still use fuel to represent mcp, but they are two different installers for qtip. Distinguish them in qtip ci scripts. Change-Id: I74165da39a607c26464ced04e1ad3ca4ed4e40e5 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
-rw-r--r--qtip/scripts/quickstart.sh4
-rw-r--r--tests/ci/utils/start_services.sh5
2 files changed, 7 insertions, 2 deletions
diff --git a/qtip/scripts/quickstart.sh b/qtip/scripts/quickstart.sh
index 826ed65..b430aa3 100644
--- a/qtip/scripts/quickstart.sh
+++ b/qtip/scripts/quickstart.sh
@@ -56,8 +56,8 @@ pod_name=${pod_name:-$NODE_NAME}
scenario=${scenario:-$SCENARIO}
testapi_url=${testapi_url:-$TESTAPI_URL}
-# we currently support ericsson, intel, lf and zte labs
-if [[ ! "$installer_type" =~ (fuel|apex) ]]; then
+# we currently support fuel, apex and mcp
+if [[ ! "$installer_type" =~ (fuel|apex|mcp) ]]; then
echo "Unsupported/unidentified installer $installer_type. Cannot continue!"
exit 1
fi
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh
index 5c95ed7..0932d45 100644
--- a/tests/ci/utils/start_services.sh
+++ b/tests/ci/utils/start_services.sh
@@ -27,5 +27,10 @@ grep "export" ${TMPFILE} | sed "s/export //" >> $ENV_FILE
# eliminate warning message "Invalid -W option ignored: invalid action: '"ignore'"
sed -i '/^PYTHONWARNINGS=/d' $ENV_FILE
+# In CI job, it still uses fuel to represent MCP.
+if [[ "${BRANCH}" =~ "master" and "${INSTALLER_TYPE}" =~ "fuel" ]]; then
+ sed -i 's/INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp' $ENV_FILE
+fi
+
docker-compose -f $script_dir/${TEST_SUITE}/docker-compose.yaml pull
docker-compose -f $script_dir/${TEST_SUITE}/docker-compose.yaml up -d