Unverified Commit dbc0a295 authored by Adam Simpson's avatar Adam Simpson Committed by GitHub
Browse files

Merge pull request #16 from robertdfrench/dont-clobber-other-vms 

Do not clobber unrelated VMs when tearing down queue. Fixes #15
parents 8b03a88f 7e7f422d

Scripts/TearDownQueue

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ if [ $(openstack keypair list | grep ContainerBuilderKey | wc -l) != 0 ]; then 
fi



# Delete VMs

openstack server list -f value --instance-name BuilderQueue -c ID | while read ID; do

openstack server list -f value --name BuilderQueue -c ID | while read ID; do

  echo "Deleting server ${ID}"

  openstack server delete --wait ${ID}

done

tests/integration/test_bring_up_queue_doesnt_clobber_unrelated_boxes.sh

0 → 100755
+26 −0
Original line number Diff line number Diff line 
#!/bin/bash -e

BOOTIMG="CADES_Ubuntu16.04_v20170804_1"

ZONE="nova"

FLAVOR="m1.medium"

NIC=$(openstack network show -c id --format value or_provider_general_extnetwork1)



echo "# Startup dummy VM"

DUMMY_VM=$(openstack server create                                       \

    --image "${BOOTIMG}"                                                \

    --flavor "${FLAVOR}"                                                \

    --availability-zone "${ZONE}"                                       \

    --nic net-id="${NIC}"                                               \

    --wait                                                              \

    -c id                                                               \

    -f value                                                            \

    "DummyVM");



echo "# Tear down queue"

cd Scripts

./TearDownQueue



echo "# Assert that dummy VM was unaffected"

openstack server list | grep $DUMMY_VM



echo "# Cleanup dummy VM"

openstack server delete --wait $DUMMY_VM