From 74e9eade54254a611da1c32eb76d9b54b595b337 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 18 Oct 2021 18:26:56 +0400 Subject: [PATCH] Use internal image for MOS9 tests Change-Id: Iffb1cda4ea967de06499d4d2bea3c6a65efe2083 --- maintenance-ci/mos/macroses/9x-systest-params.yaml | 5 ++++- maintenance-ci/mos/scripts/fuel_qa_launch_test.sh | 13 +++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml index 7f5d321..82006d8 100644 --- a/maintenance-ci/mos/macroses/9x-systest-params.yaml +++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml @@ -34,7 +34,10 @@ description: | Timestamp for test rails reporting. Normally should be inserted from snapshot job - + - bool: + name: USE_INTERNAL_IMAGE + default: true + description: "Use pre-download image for tests" - string: name: MAGNET_LINK_OVERWRITE description: "Which ISO to use in tests" diff --git a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh index 72f7d70..5500bf0 100644 --- a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh +++ b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh @@ -12,11 +12,16 @@ if [[ ! -z "${ENV_NAME_SUFFIX}" ]] ; then ENV_NAME="${ENV_NAME}.${ENV_NAME_SUFFIX}" fi echo "ENV_NAME=${ENV_NAME}" > ${WORKSPACE}/${DOS_ENV_NAME_PROPS_FILE:=.dos_environment_name} -if [[ ! -z "${ISO_EXTERNAL_LINK}" ]] ; then - export ISO_PATH="${WORKSPACE}/Mirantis_OpenStack_Custom_iso.iso" - wget -O "${ISO_PATH}" "${ISO_EXTERNAL_LINK}" + +if [[ ! -z "${USE_INTERNAL_IMAGE}" ]] ; then + export ISO_PATH="/var/lib/transmission-daemon/downloads/MirantisOpenStack-9.0.iso" else - export ISO_PATH=$(seedclient-wrapper -d -m "${MAGNET_LINK?}" -v --force-set-symlink -o "${WORKSPACE?}") + if [[ ! -z "${ISO_EXTERNAL_LINK}" ]] ; then + export ISO_PATH="${WORKSPACE}/Mirantis_OpenStack_Custom_iso.iso" + wget -O "${ISO_PATH}" "${ISO_EXTERNAL_LINK}" + else + export ISO_PATH=$(seedclient-wrapper -d -m "${MAGNET_LINK?}" -v --force-set-symlink -o "${WORKSPACE?}") + fi fi export MAKE_SNAPSHOT=${MAKE_SNAPSHOT:-false} -- 2.45.2