diff options
Diffstat (limited to 'components/congress/test-webapp/setup')
4 files changed, 6 insertions, 6 deletions
diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh index 4148751..fd41e43 100755 --- a/components/congress/test-webapp/setup/clean_congress_testserver.sh +++ b/components/congress/test-webapp/setup/clean_congress_testserver.sh @@ -21,7 +21,7 @@ # How to use: # Retrieve the testserver uninstall script as below # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/test-webapp/setup/clean_congress_testserver.sh -# $ source clean_congress_testserver.sh +# $ bash clean_congress_testserver.sh set -x echo "Get copper-webapp container ID" CID=$(sudo docker ps | awk "/copper-webapp/ { print \$1 }") diff --git a/components/congress/test-webapp/setup/install_congress_cli_test_environment.sh b/components/congress/test-webapp/setup/install_congress_cli_test_environment.sh index c072a02..48f33fa 100644 --- a/components/congress/test-webapp/setup/install_congress_cli_test_environment.sh +++ b/components/congress/test-webapp/setup/install_congress_cli_test_environment.sh @@ -25,7 +25,7 @@ # Retrieve the copper install script as below, optionally specifying the # branch to use as a URL parameter, e.g. ?h=stable%2Fbrahmaputra # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/test-webapp/setup/install_congress_cli_test_environment.sh -# $ source install_congress_cli_test_environment.sh [copper-branch] +# $ bash install_congress_cli_test_environment.sh [copper-branch] # optionally specifying the branch identifier to use for copper set -x @@ -37,7 +37,7 @@ if [ ! -d /tmp/copper ]; then mkdir /tmp/copper; fi dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'` if [ "$dist" == "Ubuntu" ]; then cp ~/congress/env.sh /tmp/copper/ - cp ~/congress/admin-openrc.sh /tmp/copper/ + cp ~/admin-openrc.sh /tmp/copper/ else echo "Copy copper environment files" sudo scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no stack@192.0.2.1:/home/stack/congress/*.sh /tmp/copper diff --git a/components/congress/test-webapp/setup/install_congress_testserver.sh b/components/congress/test-webapp/setup/install_congress_testserver.sh index a513929..9db8167 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver.sh @@ -25,7 +25,7 @@ # Retrieve the copper install script as below, optionally specifying the # branch to use as a URL parameter, e.g. ?h=stable%2Fbrahmaputra # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/test-webapp/setup/install_congress_testserver.sh -# $ source install_congress_testserver.sh [copper-branch] +# $ bash install_congress_testserver.sh [copper-branch] # optionally specifying the branch identifier to use for copper set -x @@ -89,7 +89,7 @@ sed -i -- "s/CONGRESS_HOST/$CONGRESS_HOST/g" /tmp/copper/copper/components/congr echo "Start webapp container" sudo docker build -t copper-webapp /tmp/copper/copper/components/congress/test-webapp/ -CID=$(sudo docker run -p 8080:80 -d copper-webapp) +CID=$(sudo docker run -v /tmp/copper/log:/tmp -p 8080:80 -d copper-webapp) CIP=$(sudo docker inspect $CID | grep IPAddress | cut -d '"' -f 4 | tail -1) echo "Copper Webapp IP address: $CIP" diff --git a/components/congress/test-webapp/setup/restart_congress_testserver.sh b/components/congress/test-webapp/setup/restart_congress_testserver.sh index b67abaf..97e585b 100755 --- a/components/congress/test-webapp/setup/restart_congress_testserver.sh +++ b/components/congress/test-webapp/setup/restart_congress_testserver.sh @@ -23,7 +23,7 @@ # - Congress installed through install_congress_1.sh # - ~/env.sh created as part of Congress install (install_congress_1.sh) # How to use: -# $ source restart_congress_testserver.sh +# $ bash restart_congress_testserver.sh set -x |