aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2018-04-25 15:06:21 +0800
committerzhihui wu <wu.zhihui1@zte.com.cn>2018-04-25 07:24:50 +0000
commit094386e88b330cda67cddc881825f7433bb47ea5 (patch)
tree8159b2333ee9fdcb9e73fd319fd9e8c791e25eec
parentf7ed2f20be7c848e3a79aaef2569d01a452bac77 (diff)
bugfix fraser compute ci job
https://build.opnfv.org/ci/view/qtip/job/qtip-compute-fuel-zte-virtual6-fraser/ Installer type "fuel" should be replaced to "mcp". Change-Id: I9ecdfe8e8401532d32846cd94e4d9d06486e20e9 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
-rw-r--r--tests/ci/utils/start_services.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh
index 602a999..6280be3 100644
--- a/tests/ci/utils/start_services.sh
+++ b/tests/ci/utils/start_services.sh
@@ -29,8 +29,10 @@ grep "export" ${TMPFILE} | sed "s/export //" >> $ENV_FILE
sed -i '/^PYTHONWARNINGS=/d' $ENV_FILE
# In CI job, it still uses fuel to represent MCP.
-if [[ "${BRANCH}" =~ "master" && "${INSTALLER_TYPE}" =~ "fuel" ]];then
- sed -i 's/^INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp/g' $ENV_FILE
+if [[ "${INSTALLER_TYPE}" =~ "fuel" ]];then
+ if [[ ! "${BRANCH}" =~ "euphrates" ]];then
+ sed -i 's/^INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp/g' $ENV_FILE
+ fi
fi
docker-compose -f $script_dir/${TEST_SUITE}/docker-compose.yaml pull