diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-04-25 15:06:21 +0800 |
|---|---|---|
| committer | zhihui wu <wu.zhihui1@zte.com.cn> | 2018-04-26 03:56:28 +0000 |
| commit | 873817cb48cb796bdbc4075299e92488cdee3f0e (patch) | |
| tree | 05cd79f708c3fe5938ceb88d136acd726b088384 /tests/ci | |
| parent | 2c1f682a9c7216a159f2d6c5b710eaf9bb7ccebe (diff) | |
bugfix fraser compute ci jobopnfv-6.0.0
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>
(cherry picked from commit 094386e88b330cda67cddc881825f7433bb47ea5)
Diffstat (limited to 'tests/ci')
| -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 |