diff options
| -rw-r--r-- | components/congress/install/bash/setenv.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | components/congress/test-webapp/setup/clean_congress_testserver.sh | 0 | ||||
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver.sh | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | components/congress/test-webapp/setup/restart_congress_testserver.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/adhoc/smoke01-clean.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/adhoc/smoke01.sh | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/run.sh | 0 |
7 files changed, 6 insertions, 6 deletions
diff --git a/components/congress/install/bash/setenv.sh b/components/congress/install/bash/setenv.sh index 11bd460..17cfe93 100644 --- a/components/congress/install/bash/setenv.sh +++ b/components/congress/install/bash/setenv.sh @@ -32,7 +32,7 @@ if [ "$dist" == "Ubuntu" ]; then echo "Create the environment file" KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") cat <<EOF >/tmp/copper/env.sh -export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") +export CONGRESS_HOST=$(juju status --format=short | awk "/congress\/0/ { print \$3 }") export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") export KEYSTONE_HOST=$KEYSTONE_HOST export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh index fb033e9..fb033e9 100755..100644 --- a/components/congress/test-webapp/setup/clean_congress_testserver.sh +++ b/components/congress/test-webapp/setup/clean_congress_testserver.sh diff --git a/components/congress/test-webapp/setup/install_congress_testserver.sh b/components/congress/test-webapp/setup/install_congress_testserver.sh index e720184..a16d1be 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver.sh @@ -95,8 +95,8 @@ sed -i -- "s/OS_PASSWORD/$OS_PASSWORD/g" /tmp/copper/copper/components/congress/ echo "Start webapp container" sudo docker build -t copper-webapp /tmp/copper/copper/components/congress/test-webapp/ -CID=$(sudo docker run -v /tmp/copper/log:/tmp -p 8257:80 -d copper-webapp) -CIP=$(sudo docker inspect $CID | grep IPAddress | cut -d '"' -f 4 | tail -1) +sudo docker run -d -v /tmp/copper/log:/tmp -p 8257:80 --name copper copper-webapp +CIP=$(sudo docker inspect copper | grep IPAddress | cut -d '"' -f 4 | tail -1) echo "Copper Webapp IP address: $CIP" set +x diff --git a/components/congress/test-webapp/setup/restart_congress_testserver.sh b/components/congress/test-webapp/setup/restart_congress_testserver.sh index 97e585b..97e585b 100755..100644 --- a/components/congress/test-webapp/setup/restart_congress_testserver.sh +++ b/components/congress/test-webapp/setup/restart_congress_testserver.sh diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh index a846dbb..a846dbb 100755..100644 --- a/tests/adhoc/smoke01-clean.sh +++ b/tests/adhoc/smoke01-clean.sh diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh index 81684e1..dd1dd56 100755..100644 --- a/tests/adhoc/smoke01.sh +++ b/tests/adhoc/smoke01.sh @@ -63,7 +63,7 @@ function get_external_net () { else echo "$0: External network not found" echo "$0: Create external network" - neutron net-create public --router:external + openstack network create --external public EXTERNAL_NETWORK_NAME="public" echo "$0: Create external subnet" neutron subnet-create public 192.168.10.0/24 --name public --enable_dhcp=False --allocation_pool start=192.168.10.6,end=192.168.10.49 --gateway 192.168.10.1 @@ -145,7 +145,7 @@ echo "$0: Get cirros1 instance ID" test_cirros1_ID=$(openstack server list | awk "/ cirros1 / { print \$2 }") echo "$0: Wait for cirros1 to go ACTIVE" -COUNTER=5 +COUNTER=10 RESULT="Test Failed!" until [[ $COUNTER -eq 0 || $RESULT == "Test Success!" ]]; do status=$(openstack server show $test_cirros1_ID | awk "/ status / { print \$4 }") @@ -161,7 +161,7 @@ nova floating-ip-associate cirros1 $FLOATING_IP echo "$0: Boot cirros2" nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$internal_NET --security-groups smoke01 cirros2 -COUNTER=1 +COUNTER=10 RESULT="Failed!" until [[ "$COUNTER" -gt 6 || "$RESULT" == "Success!" ]]; do echo "$0: Verify internal network connectivity" diff --git a/tests/run.sh b/tests/run.sh index 333779e..333779e 100755..100644 --- a/tests/run.sh +++ b/tests/run.sh |