diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90d0f963ec521a2af31ba348c175e95769c3b661..ed28e9ce8d02e0414f6660b661a1b6ef1f860c60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,9 +44,14 @@ prep-deploy: 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 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') - + for volume_id in $volume_ids; do + volume_name=$(openstack volume show $volume_id -c name -f value) + if [[ $volume_name == xdmod-dev-volume* ]]; then + export prod_volume=$volume_id + elif [[ $volume_name == xdmod-dev-queue-volume* ]]; then + export prod_queue_volume=$volume_id + fi + done echo "Detaching prod_volume=${prod_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot"