]> review.fuel-infra Code Review - tools/sustaining.git/commitdiff
Use internal image for MOS9 tests 42/41842/1
authorVladimir Khlyunev <vkhlyunev@mirantis.com>
Mon, 18 Oct 2021 14:26:56 +0000 (18:26 +0400)
committerVladimir Khlyunev <vkhlyunev@mirantis.com>
Mon, 18 Oct 2021 14:26:56 +0000 (18:26 +0400)
Change-Id: Iffb1cda4ea967de06499d4d2bea3c6a65efe2083

maintenance-ci/mos/macroses/9x-systest-params.yaml
maintenance-ci/mos/scripts/fuel_qa_launch_test.sh

index 7f5d3218dbba2b518c29531ddd127d5cd73cf173..82006d88d67046667903550f4f0f638aec869f61 100644 (file)
         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"
index 72f7d70e5b4febcd6eab4833a6cf656236815ff2..5500bf06dd4ab1074d345d6fe6fd3a1951821843 100644 (file)
@@ -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}