From 50ca5d1d5c2206ec04e10a41b65c99122e4a372c Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Thu, 2 Sep 2021 14:25:16 +0200
Subject: [PATCH] add some messages to the rollback job
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b045ac..d44a342 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,15 +138,15 @@ cleanup-failed-full-deployment:
REMOVE_ID=`openstack server show $TESTING_NAME -f value -c id`;
openstack server set --name $TESTING_NAME $OLD_TEST_ID;
openstack server add floating ip $OLD_TEST_ID $TESTING_IP;
- openstack server delete $REMOVE_ID && echo "Deleted old testing server.";
+ openstack server delete $REMOVE_ID && echo "Deleted faulty testing server.";
fi
# if applicable, rollback prod server
- if [ "$rollback_prod" = true ] ; then
- REMOVE_ID=`openstack server show $PRODUCTION_NAME -f value -c id`;
+ REMOVE_ID=`openstack server show $PRODUCTION_NAME -f value -c id` || "No new production server found.";
openstack server set --name $PRODUCTION_NAME $OLD_PROD_ID;
openstack server add floating ip $OLD_PROD_ID $PRODUCTION_IP;
- openstack server remove volume $REMOVE_ID $VOLUME_ID;
- openstack server delete $REMOVE_ID && echo "Deleted old testing server.";
+ openstack server remove volume $REMOVE_ID $VOLUME_ID || "No Volume was removed.";
+ openstack server delete $REMOVE_ID && echo "Deleted faulty production server." || "No faulty production was deleted.";
openstack server add volume $OLD_PROD_ID $VOLUME_ID;
ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "mount /dev/vdb1 /app/mnt";
fi
--
GitLab