diff options
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver_1.sh | 2 | ||||
| -rw-r--r-- | tests/adhoc/dmz01-clean.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/dmz01.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/reserved_subnet-clean.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/reserved_subnet.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/smoke01-clean.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/smoke01.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/smtp_ingress-clean.sh | 4 | ||||
| -rw-r--r-- | tests/adhoc/smtp_ingress.sh | 4 |
9 files changed, 10 insertions, 24 deletions
diff --git a/components/congress/test-webapp/setup/install_congress_testserver_1.sh b/components/congress/test-webapp/setup/install_congress_testserver_1.sh index 8752c0c..dfb2a4b 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh @@ -101,6 +101,8 @@ EOF sudo scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no stack@192.0.2.1:/home/stack/congress/*.sh /tmp/copper source /tmp/copper/env.sh cp -r ~/git/copper/components/congress/test-webapp/* /tmp/copper/ + if [ ! -d /tmp/copper/tests ]; then mkdir /tmp/copper/tests; fi + cp -r ~/git/copper/tests/* /tmp/copper/tests echo "Point proxy.php to the Congress server" source /tmp/copper/env.sh sed -i -- "s/CONGRESS_HOST/$CONGRESS_HOST/g" /tmp/copper/www/proxy/index.php diff --git a/tests/adhoc/dmz01-clean.sh b/tests/adhoc/dmz01-clean.sh index 4d19941..d6482c6 100644 --- a/tests/adhoc/dmz01-clean.sh +++ b/tests/adhoc/dmz01-clean.sh @@ -27,9 +27,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Get Congress policy 'test' ID" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") diff --git a/tests/adhoc/dmz01.sh b/tests/adhoc/dmz01.sh index bc5486a..1796b27 100644 --- a/tests/adhoc/dmz01.sh +++ b/tests/adhoc/dmz01.sh @@ -36,9 +36,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Delete Congress policy 'test' if it exists" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") diff --git a/tests/adhoc/reserved_subnet-clean.sh b/tests/adhoc/reserved_subnet-clean.sh index 7d5fbd6..4f149ba 100644 --- a/tests/adhoc/reserved_subnet-clean.sh +++ b/tests/adhoc/reserved_subnet-clean.sh @@ -31,9 +31,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Get Congress policy 'test' ID" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") diff --git a/tests/adhoc/reserved_subnet.sh b/tests/adhoc/reserved_subnet.sh index 75d4e48..7b3ac12 100644 --- a/tests/adhoc/reserved_subnet.sh +++ b/tests/adhoc/reserved_subnet.sh @@ -31,9 +31,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Delete Congress policy 'test' if it exists" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh index 72397c9..9c0138d 100644 --- a/tests/adhoc/smoke01-clean.sh +++ b/tests/adhoc/smoke01-clean.sh @@ -26,9 +26,7 @@ set -x #echo on -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh instance=$(nova list | awk "/ cirros1 / { print \$2 }") if [ "$instance" != "" ]; then nova delete $instance diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh index 593d185..22e2089 100644 --- a/tests/adhoc/smoke01.sh +++ b/tests/adhoc/smoke01.sh @@ -29,9 +29,7 @@ set -x #echo on -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh openstack service list diff --git a/tests/adhoc/smtp_ingress-clean.sh b/tests/adhoc/smtp_ingress-clean.sh index 00333f8..0791125 100644 --- a/tests/adhoc/smtp_ingress-clean.sh +++ b/tests/adhoc/smtp_ingress-clean.sh @@ -27,9 +27,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Get Congress policy 'test' ID" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") diff --git a/tests/adhoc/smtp_ingress.sh b/tests/adhoc/smtp_ingress.sh index 0616341..b787691 100644 --- a/tests/adhoc/smtp_ingress.sh +++ b/tests/adhoc/smtp_ingress.sh @@ -30,9 +30,7 @@ if [ $1 == "debug" ]; then set -x #echo on fi -source ~/admin-openrc.sh <<EOF -openstack -EOF +source /opt/copper/admin-openrc.sh echo "Delete Congress policy 'test' if it exists" test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }") |