bugfix: error in sed expression 93/48293/7
authorzhihui wu <wu.zhihui1@zte.com.cn>
Mon, 4 Dec 2017 02:56:28 +0000 (10:56 +0800)
committerzhihui wu <wu.zhihui1@zte.com.cn>
Wed, 6 Dec 2017 01:50:13 +0000 (09:50 +0800)
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>
tests/ci/utils/start_services.sh

index 0932d45..c212957 100644 (file)
@@ -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