]> review.fuel-infra Code Review - tools/sustaining.git/commitdiff
Allow to use custom iso in mos deploy 24/41024/4
authorVladimir Khlyunev <vkhlyunev@mirantis.com>
Thu, 11 Apr 2019 11:39:30 +0000 (15:39 +0400)
committerVladimir Khlyunev <vkhlyunev@mirantis.com>
Fri, 12 Apr 2019 13:23:51 +0000 (17:23 +0400)
Change-Id: I589093edbc8ccd744074efcd59c0fc96f2f8493e

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

index cfc41d42d4fbd89e4e9d52dcc548cfc620ce83b0..706f094733e18feb1758af9eee3cae03fb986063 100644 (file)
         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
index 6a7b1db7f48de8c2293a656896bd477be0a075b1..a3fc8701b55d4ec12d619e519b6bc94ca2a76b97 100644 (file)
@@ -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?}"