summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bs3131@att.com>2016-04-07 22:18:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-07 22:18:18 +0000
commit373b65cb05edd555edf20fe6243e911bdc08c6ed (patch)
treebb21630a043a74efd6478a65fafe465e1e9d5f7d
parentea4856140511943c0d426283988bc8ccb8018748 (diff)
parent61461a7054b5f26b131fc7ef2e961b492930c0b9 (diff)
Merge "Add debug option, comment out upgrade (run faster)" into stable/brahmaputra
-rw-r--r--components/congress/test-webapp/setup/install_congress_testserver_1.sh4
-rw-r--r--components/congress/test-webapp/setup/install_congress_testserver_2.sh2
2 files changed, 4 insertions, 2 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 2c65464..57a39e4 100644
--- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh
+++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh
@@ -34,7 +34,9 @@ if [ $# -lt 2 ]; then
return 2
fi
-if [ $1 == "debug" ]; then set -x #echo on
+if [ $# -eq 3 ]; then
+ if [ $3 == "debug" ]; then set -x #echo on
+ fi
fi
echo "Install prerequisites"
diff --git a/components/congress/test-webapp/setup/install_congress_testserver_2.sh b/components/congress/test-webapp/setup/install_congress_testserver_2.sh
index 98fdcd2..aacc0fe 100644
--- a/components/congress/test-webapp/setup/install_congress_testserver_2.sh
+++ b/components/congress/test-webapp/setup/install_congress_testserver_2.sh
@@ -31,7 +31,7 @@ EOF
echo "Update the base server"
set -x
sudo apt-get update
-sudo apt-get -y upgrade
+#sudo apt-get -y upgrade
echo "Install pip"
sudo apt-get install -y python-pip