openstack/neutron-vpnaas
Code Issues Proposed changes

VPNaaS: Cleanup functional hook scripts

Browse Source 
This does a few minor fixes. First, it changes the bash invocation
line. Next, it uses a case statement for one multicondition if-clause.
Third, it uses VENV for the virtual environemnt variable to be
consistent with gate_hook.sh.

Change-Id: I788c95657fe70e894bb55beca190ba6bedf71aca
This commit is contained in:
Paul Michali 2015-05-26 20:27:25 +00:00
parent 10a3686ab3
commit e8a2e0059d
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_vpnaas/tests/contrib/gate_hook.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -ex

33
neutron_vpnaas/tests/contrib/post_test_hook.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -xe
@ -6,40 +6,41 @@ NEUTRON_VPNAAS_DIR="$BASE/new/neutron-vpnaas"
TEMPEST_DIR="$BASE/new/tempest"
SCRIPTS_DIR="/usr/local/jenkins/slave_scripts"
venv=${1:-"dsvm-functional"}
VENV=${1:-"dsvm-functional"}
function generate_testr_results {
# Give job user rights to access tox logs
sudo -H -u $owner chmod o+rw .
sudo -H -u $owner chmod o+rw -R .testrepository
if [ -f ".testrepository/0" ] ; then
.tox/$venv/bin/subunit-1to2 < .testrepository/0 > ./testrepository.subunit
.tox/$venv/bin/python $SCRIPTS_DIR/subunit2html.py ./testrepository.subunit testr_results.html
.tox/$VENV/bin/subunit-1to2 < .testrepository/0 > ./testrepository.subunit
.tox/$VENV/bin/python $SCRIPTS_DIR/subunit2html.py ./testrepository.subunit testr_results.html
gzip -9 ./testrepository.subunit
gzip -9 ./testr_results.html
sudo mv ./*.gz /opt/stack/logs/
fi
}
if [[ "$venv" == "dsvm-functional" || "$venv" == "dsvm-functional-sswan" ]]
then
owner=stack
sudo_env=
elif [ "$venv" == "api" ]
then
owner=tempest
# Configure the api tests to use the tempest.conf set by devstack.
sudo_env="TEMPEST_CONFIG_DIR=$TEMPEST_DIR/etc"
fi
case $VENV in
dsvm-functional | dsvm-functional-sswan)
owner=stack
sudo_env=
;;
api)
owner=tempest
# Configure the api tests to use the tempest.conf set by devstack.
sudo_env="TEMPEST_CONFIG_DIR=$TEMPEST_DIR/etc"
;;
esac
# Set owner permissions according to job's requirements.
cd $NEUTRON_VPNAAS_DIR
sudo chown -R $owner:stack $NEUTRON_VPNAAS_DIR
# Run tests
echo "Running neutron $venv test suite"
echo "Running neutron $VENV test suite"
set +e
sudo -H -u $owner $sudo_env tox -e $venv
sudo -H -u $owner $sudo_env tox -e $VENV
testr_exit_code=$?
set -e