Merge branch 'master' into 166-make-rocketchat-test-deployment

.gitlab/ci_scripts/can_reuse_machine.py

@@ -13,14 +13,16 @@ import greenhost_cloud
 HOSTNAME = sys.argv[1]
 IP_ADDRESS = sys.argv[2]
 MACHINES = greenhost_cloud.get_droplets_by_name("^{}$".format(HOSTNAME))
+
 if MACHINES == []:
     print("No machines found with hostname {}".format(HOSTNAME))
     exit(1)
+
 for machine in MACHINES:
     print("Machine status is {}".format(machine['status']))
     print("Comparing IP address {} with IP address {}".format(
         machine['networks']['v4'][0]['ip_address'], IP_ADDRESS))
-    if machine['status'] != 'running' or \
-            machine['networks']['v4'][0]['ip_address'] != IP_ADDRESS:
+    if machine['status'] != 'running' and \
+            machine['networks']['v4'][0]['ip_address'] == IP_ADDRESS:
         exit(0)
 exit(1)

.gitlab/ci_scripts/create_vps.sh

@@ -10,6 +10,7 @@ then
   # script exits with 0 (true) if the machine can be reused
   if python3 $(dirname "$0")/can_reuse_machine.py $HOSTNAME $ip_address
   then
+    echo "Will reuse machine with hostname '$HOSTNAME' and ip address '$ip_address'"
     exit 0
   fi
 fi