diff --git a/.gitlab/ci_scripts/can_reuse_machine.py b/.gitlab/ci_scripts/can_reuse_machine.py index c3593dde608a7af8481daec11b4681b66ddea82e..7b5c4bf80e26ecc556cb7a15c2bb363f233eb544 100644 --- a/.gitlab/ci_scripts/can_reuse_machine.py +++ b/.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)