diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16b64ce865f5591f1771547817611bcd67e9c0ee..50154d48543a9de08cca684153e861805106e623 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,7 +132,6 @@ production-deploy: ssh-add "${SSH_PRIV_KEY}" mkdir ~/.ssh chmod 700 ~/.ssh - - export instance_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}') - echo "Detaching instance_volume_id=${instance_volume} from new instance=${instance_id}" - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$instance_floating_ip sudo systemctl stop mariadb @@ -147,9 +146,10 @@ production-deploy: - openstack server remove volume $prod_instance_id $prod_volume - openstack volume snapshot create --volume $prod_volume xdmod-prod-data-vol-snapshot-$BUILD_DATE - - echo "Attach copy of prod volume $xdmod-prod-vol-$BUILD_DATE to newly deployed instance $instance_id" - - openstack volume create --snapshot xdmod-prod-data-vol-snapshot-$BUILD_DATE --size 150 xdmod-prod-vol-$BUILD_DATE - - openstack server add volume $instance_id xdmod-prod-vol-$BUILD_DATE --device /dev/vdb + - echo "Reattach the prod_volume=${prod_volume} to prod_instance_id=${prod_instance_id} after snapshot is created" + - openstack server add volume $prod_instance_id $prod_volume --device /dev/vdb + - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo mount /dev/vdb1 /var/lib/mysql && df -h + - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo systemctl start mariadb - echo "swap the floating IP between prod and newly deployed instances" - openstack server remove floating ip $prod_instance_id $prod_floating_ip