diff options
Diffstat (limited to 'tests/ci/utils/start_services.sh')
| -rw-r--r-- | tests/ci/utils/start_services.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index c2129570..6280be36 100644 --- a/tests/ci/utils/start_services.sh +++ b/tests/ci/utils/start_services.sh @@ -19,6 +19,7 @@ OPNFV_RELEASE=${OPNFV_RELEASE:-} EOF export SSH_CREDENTIALS=${SSH_CREDENTIALS:-/root/.ssh} +export IMAGE_DIR=${IMAGE_DIR:-$HOME/tmp} TMPFILE=`mktemp /tmp/qtip.XXXXXX` || exit 1 curl https://git.opnfv.org/releng/plain/utils/fetch_os_creds.sh | bash -s -- \ @@ -28,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 |