Update mos build script

- Add devops lock file
- Download MOS image before build

Change-Id: I70c286b43618bf4843b49a78d1a3236ec6009413

diff --git a/maintenance-ci/common/data/jenkins-slave.yml b/maintenance-ci/common/data/jenkins-slave.yml
index 45c599d8acdab5d2ca251b385bd489f0c0db66c1..5896e468a8c032dc7a95d707d55cdb8f385bff73 100644 (file)
--- a/maintenance-ci/common/data/jenkins-slave.yml
+++ b/maintenance-ci/common/data/jenkins-slave.yml
@@ -62,6 +62,7 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: image }
+      availability_zone: nova
       flavor: { get_param: flavor }
       key_name: { get_param: key_name }
       networks:

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 f0ba5eb8df3aedfe4bb8053193876c6491e72b60..ecae314a473e44ea724796bbdf88f5edea39297d 100644 (file)
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -ex
 
+growpart /dev/nbd0 1
+resize2fs /dev/nbd0p1
+
 if [[ -f /tmp/jjb_creds.sh ]] ; then
 source /tmp/jjb_creds.sh
 fi
@@ -25,6 +28,7 @@ apt update
 
 apt -yq install --no-install-recommends --no-install-suggests openjdk-8-jre git \
 build-essential \
+aria2 \
 gcc \
 bridge-utils \
 libyaml-dev \
@@ -131,6 +135,7 @@ 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 virtualenv
 sudo -u jenkins -H bash -c "virtualenv /home/jenkins/qa-venv-9.x
@@ -143,6 +148,7 @@ source /home/jenkins/qa-venv-9.x/bin/activate
 
 deactivate
 "
+echo "export DEVOPS_LOCK_FILE=/run/lock/devops_lock" >> /home/jenkins/qa-venv-9.x/bin/activate
 chown -R jenkins:jenkins /home/jenkins/
 
 cp /etc/apt/sources.list.bkp /etc/apt/sources.list

diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
index db9c35cd2e4c2a8e48bb736e9565c8e583a3290c..f886885d9247b709ee341e05406d238620ee6ec5 100755 (executable)
--- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh
+++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
@@ -32,6 +32,9 @@ sudo apt install -y qemu-utils
 
 sudo modprobe nbd max_part=16
 sudo qemu-nbd -d /dev/nbd0 || pass
+
+sudo qemu-img resize xenial-server-cloudimg-amd64-disk1.img 6G
+
 sudo qemu-nbd -c /dev/nbd0 xenial-server-cloudimg-amd64-disk1.img
 sleep 1
 sudo partx -a /dev/nbd0
@@ -79,5 +82,5 @@ source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
 
 set -x
 openstack image delete "${GLANCE_IMAGE_NAME}" || true
-openstack image create --disk-format qcow2 --container-format bare --file xenial-server-cloudimg-amd64-disk1.img "${GLANCE_IMAGE_NAME}"
+openstack image create --min-disk 6 --disk-format qcow2 --container-format bare --file xenial-server-cloudimg-amd64-disk1.img "${GLANCE_IMAGE_NAME}"
 deactivate
\ No newline at end of file