x
/
fuel-ccp
Code Issues Proposed changes

Merge "Small fix for failing networking destroy test"

This commit is contained in:
Jenkins 2016-10-21 13:37:03 +00:00 committed by Gerrit Code Review
parent ad16358660 8aa4caf209
commit f6ae9c6884
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/ccp-multi-deploy/ccp-multi-deploy.sh
View File

@ -56,8 +56,7 @@ function display_horizon_access_info {
function run_openstack_tests {
source $1
./tools/deploy-test-vms.sh -a create
# FIXME(mzawadzki): workaround for some minor error during networking destroy (minor b/c it works manually)
./tools/deploy-test-vms.sh -a destroy || true
./tools/deploy-test-vms.sh -a destroy
}

4
tools/deploy-test-vms.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Simple script, which is going to create network, flavor, download cirros
# image and launch some VMs. Could be used for test purposes.
@ -72,7 +72,7 @@ create() {
destroy() {
for vm in $(openstack server list | awk '/test_vm/ {print $4}'); do
echo "Destroying $vm..."
openstack server delete $vm
openstack server delete --wait $vm
done
echo "Destroying testnetwork..."
openstack network delete testnetwork