diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70854af61b9584310307f37556fa6155b8031ae1..2b0b515fe01dcd9bf78440396694493570a14bb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,8 +41,9 @@ prep-deploy: openstack volume create --snapshot xdmod-staging-vol-snapshot --size 150 $TF_VAR_data_volume elif [ "$TARGET_ENV" = "production" ]; then 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}') - export prod_queue_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2') + export volume_ids=$(openstack server show $prod_instance_id -c volumes_attached | grep -o "id='[a-zA-Z0-9\-]*'" | awk -F "'" '{print $2}') + export prod_volume=$(echo "$volume_ids" | awk 'NR==1') + export prod_queue_volume=$(echo "$volume_ids" | awk 'NR==2') echo "Detaching prod_volume=${prod_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot" echo "Detaching prod_queue_volume=${prod_queue_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot"