diff options
| author |   blsaws <bs3131@att.com> | 2016-04-07 20:31:42 -0700 |
|---|---|---|
| committer | blsaws <bs3131@att.com> | 2016-04-07 20:31:42 -0700 |
| commit | 4baeedf8c6633963e1b5f8632b1c5dce18618045 (patch) | |
| tree | b78dc586ff4aab21677e1286d36582c816b8dc46 | |
| parent | e77e18964c3d6a9310c018d6c23bfa680dcd19f0 (diff) | |
Remove Tempest install (not required) and fix install script reference.
JIRA: COPPER-2
Change-Id: I00d43cb64acd8cc584154187e58439a40ce85c4d
Signed-off-by: blsaws <bs3131@att.com>
| -rw-r--r-- | components/congress/joid/install_congress_1.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/components/congress/joid/install_congress_1.sh b/components/congress/joid/install_congress_1.sh index 4ff3d4f..892129c 100644 --- a/components/congress/joid/install_congress_1.sh +++ b/components/congress/joid/install_congress_1.sh @@ -67,8 +67,8 @@ juju scp ~/admin-openrc.sh ubuntu@$CONGRESS_HOST:/home/ubuntu juju scp ~/env.sh ubuntu@$CONGRESS_HOST:/home/ubuntu echo "Copy install_congress_2.sh to the congress server and execute" -juju scp ~/git/copper/components/congress/joid/install_congress_2b.sh ubuntu@$CONGRESS_HOST:/home/ubuntu -ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$CONGRESS_HOST "source ~/install_congress_2b.sh; exit" +juju scp ~/git/copper/components/congress/joid/install_congress_2.sh ubuntu@$CONGRESS_HOST:/home/ubuntu +ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$CONGRESS_HOST "source ~/install_congress_2.sh; exit" echo "Install jumphost dependencies" @@ -177,18 +177,10 @@ openstack congress datasource create keystone "keystone" \ --config password=$OS_PASSWORD \ --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -echo "Install Tempest and dependencies" -sudo apt-get install libffi-dev libssl-dev -cd ~/git -git clone https://github.com/openstack/tempest/ -cd tempest -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . - -echo "Copy Congress tests to tempest folder" -cp -r ~/git/congress/contrib/tempest/tempest/ /opt/stack/tempest/ +echo "Install tox test dependencies" +sudo apt-get install -y libffi-dev libssl-dev -echo "Run Congress Tempest Tests" +echo "Run Congress tox Tests" cd ~/git/congress bin/tox -epy27 |