diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2017-12-06 07:45:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-06 07:45:17 +0000 |
| commit | 196517f67aea7202b71682577456d59b73759df7 (patch) | |
| tree | 93eaf0ce0f0da285d60167077b06f5641ebad6b0 | |
| parent | 33fe72d9e48315fc79cec9610ebfb81f5cb6047d (diff) | |
| parent | ceffa8b9728173fb487b910b266f1e3dca1842d2 (diff) | |
Merge "bugfix: error in sed expression"
| -rw-r--r-- | tests/ci/utils/start_services.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index 0932d45e..c2129570 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 |