diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-04-26 02:28:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-26 02:28:09 +0000 |
| commit | fa1db37ceb88695b3aeb069e1f56007bead3c523 (patch) | |
| tree | f6e167f0b62e8e6cf5d80c2e6eee0d4a7d84f4cd /tests/ci/utils | |
| parent | c934821173ff9adb5608d4df2418ac23fa0b8251 (diff) | |
| parent | 094386e88b330cda67cddc881825f7433bb47ea5 (diff) | |
Merge "bugfix fraser compute ci job"
Diffstat (limited to 'tests/ci/utils')
| -rw-r--r-- | tests/ci/utils/start_services.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index 602a999e..6280be36 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 |