Skip to content

Commit c7d8cdb

Browse files
liushengkiwik
authored andcommitted
Fix resource cleanup of docker-machine job (apache#340)
1 parent 783f656 commit c7d8cdb

File tree

1 file changed

+2
-4
lines changed
  • playbooks/docker-machine-functional-public-clouds

1 file changed

+2
-4
lines changed

playbooks/docker-machine-functional-public-clouds/run.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,11 @@
8080
export DRIVER=openstack
8181
export MACHINE_STORAGE_PATH="/tmp/machine-bats-test-$DRIVER"
8282
for machine_name in $(docker-machine ls -q); do
83-
fip=$(docker-machine ip $machine_name)
83+
fip=$(docker-machine ip $machine_name) || true
8484
docker-machine rm -f $machine_name
8585
openstack server delete $machine_name || true
8686
openstack floating ip delete $fip || true
87-
for key in $(openstack keypair list -f value -c Name |grep $machine_name); do
88-
openstack keypair delete $key || true
89-
done
87+
openstack keypair delete `openstack keypair list -f value -c Name |grep $machine_name` || true
9088
done
9189
args:
9290
executable: /bin/bash

0 commit comments

Comments
 (0)