aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-12-04 10:56:28 +0800
committerzhihui wu <wu.zhihui1@zte.com.cn>2017-12-06 09:50:13 +0800
commitceffa8b9728173fb487b910b266f1e3dca1842d2 (patch)
tree60fd7a0c03ae4f87a89ce3f48477f848e37e28ab
parent795221ce0cbd9daf23af9f3099e29c947bcad306 (diff)
bugfix: error in sed expression
Refer to https://build.opnfv.org/ci/view/qtip/job/qtip-compute-apex-zte-virtual5-master/12/console Change-Id: I81991ce36a2827e614fb77ceb9276c444cc1c004 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
-rw-r--r--tests/ci/utils/start_services.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh
index 0932d45..c212957 100644
--- a/tests/ci/utils/start_services.sh
+++ b/tests/ci/utils/start_services.sh
@@ -28,8 +28,8 @@ 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" and "${INSTALLER_TYPE}" =~ "fuel" ]]; then
- sed -i 's/INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp' $ENV_FILE
+if [[ "${BRANCH}" =~ "master" && "${INSTALLER_TYPE}" =~ "fuel" ]];then
+ sed -i 's/^INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp/g' $ENV_FILE
fi
docker-compose -f $script_dir/${TEST_SUITE}/docker-compose.yaml pull