From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Thu, 11 Apr 2019 11:39:30 +0000 (+0400)
Subject: Allow to use custom iso in mos deploy
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=706a252a498783b202e142e21356bbeb5a2c4f98;p=tools%2Fsustaining.git

Allow to use custom iso in mos deploy

Change-Id: I589093edbc8ccd744074efcd59c0fc96f2f8493e
---

diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml
index cfc41d4..706f094 100644
--- a/maintenance-ci/mos/macroses/9x-systest-params.yaml
+++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml
@@ -30,6 +30,10 @@
         name: MAGNET_LINK_OVERWRITE
         description: "Which ISO to use in tests"
         default: !include-raw: ../data/9.0-iso
+    - string:
+        name: ISO_EXTERNAL_LINK
+        description: "Used for custom build iso images located outside of slave"
+        default: ""
 
     - string:
         name: FUEL_QA_COMMIT
diff --git a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
index 6a7b1db..a3fc870 100644
--- a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
+++ b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
@@ -12,7 +12,12 @@ 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}
-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
 export MAKE_SNAPSHOT=${MAKE_SNAPSHOT:-false}
 
 echo "Description string: ${TEST_GROUP?} on ${CUSTOM_VERSION?}"