From c20728185a2eaf16d66cb8d5fe39c8f3d6693218 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 19 Dec 2023 15:21:56 -0600
Subject: [PATCH] fix for
 https://gitlab.rc.uab.edu/rc/terraform-openstack/-/issues/19 seen in
 https://gitlab.rc.uab.edu/rc/terraform-openstack/-/jobs/39446

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 315b247..75318b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,7 @@ prep-deploy:
            export prod_instance_id=$(openstack floating ip show $prod_floating_ip -c port_details -f value | awk -F', ' '{print $2}' | awk -F"'" '{print $2}')
            export prod_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
            echo "Detaching prod_volume=${prod_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot"
-           openstack server stop $prod_instance_id
-           openstack server remove volume $prod_instance_id $prod_volume
+           openstack server stop $prod_instance_id && openstack server remove volume $prod_instance_id $prod_volume
            openstack volume snapshot create --volume $prod_volume xdmod-prod-vol-snapshot-$BUILD_DATE
 
            echo "Reattach the prod_volume=${prod_volume} to prod_instance_id=${prod_instance_id} after snapshot is created"
-- 
GitLab