From 0bf0134103de512984d7ccb847359aa441799709 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 17 Nov 2023 11:17:31 -0600
Subject: [PATCH] refactor: Improve Volume Naming in Staging Script
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e9c520..b2843d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,11 +155,11 @@ production-deploy:
- openstack server stop $prod_instance_id
# Exporting Staging Volume IDs
- - export staging_volume1=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==1')
- - export staging_volume2=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2')
+ - export staging_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==1')
+ - export staging_queue_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2')
# Logging Information
- - echo "Detaching staging_volume1_id=${staging_volume1} and staging_volume2_id=${staging_volume2} from staging_instance_id=${instance_id}"
+ - echo "Detaching staging_volume_id=${staging_volume} and staging_queue_volume_id=${staging_queue_volume} from staging_instance_id=${instance_id}"
# Stopping MariaDB Service on Staging Instance
- ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo systemctl stop mariadb
@@ -169,8 +169,8 @@ production-deploy:
- ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo umount /data/xdmod/queues && df -h
# Removing Volumes from Server
- - openstack server remove volume $instance_id $staging_volume1
- - openstack server remove volume $instance_id $staging_volume2
+ - openstack server remove volume $instance_id $staging_volume
+ - openstack server remove volume $instance_id $staging_queue_volume
- echo "Attach prod volume $xdmod-prod-vol-$BUILD_DATE to staging instance $instance_id"
- openstack volume snapshot create --volume $prod_volume xdmod-prod-data-vol-snapshot-$BUILD_DATE
--
GitLab