Download image at last step

Change-Id: I1ad3871d743c6d72826f65462cf31ceb32d52715

diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index d0702c985b65c0ff9712ad115c390f5be73f6aaa..c204f3a7076c617d5526022cbcca94ff6b0c9d2e 100644 (file)
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -156,8 +156,6 @@ sudo -u postgres psql -c "CREATE USER fuel_devops PASSWORD 'fuel_devops'" || tru
 sudo -u postgres psql -c "CREATE ROLE fuel_devops WITH LOGIN PASSWORD 'fuel_devops'" || true
 sudo -u postgres createdb fuel_devops -O fuel_devops || true
 
-aria2c --allow-overwrite=true --seed-time=0 --enable-dht=false -d /var/lib/transmission-daemon/downloads/ http://seed.fuel-infra.org/fuelweb-release/MirantisOpenStack-9.0.iso.torrent
-
 pip install -U setuptools wheel
 pip install virtualenv
 sudo -u jenkins -H bash -c "virtualenv /home/jenkins/qa-venv-9.x
@@ -172,6 +170,8 @@ deactivate
 "
 echo "export DEVOPS_LOCK_FILE=/run/lock/devops_lock" >> /home/jenkins/qa-venv-9.x/bin/activate
 
+aria2c --allow-overwrite=true --seed-time=0 --enable-dht=false -d /var/lib/transmission-daemon/downloads/ http://seed.fuel-infra.org/fuelweb-release/MirantisOpenStack-9.0.iso.torrent
+
 shopt -s dotglob
 chown -R jenkins:jenkins /home/jenkins/
 shopt -u dotglob

diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh
index fcf31cd59b0f55dba121ca3a682c046195c3f80d..c8f728b19cdb9940f828b1306370972b37ce2842 100755 (executable)
--- a/maintenance-ci/common/scripts/delete_heat_stack.sh
+++ b/maintenance-ci/common/scripts/delete_heat_stack.sh
@@ -7,7 +7,7 @@ OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-c
 if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then
     virtualenv "${OPENSTACK_CLIENTS_VENV}"
     source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
-    pip install openstackclient
+    pip install -U 'openstackclient<4.0.0'
     deactivate
 fi