summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-04 22:46:19 +0000
committerGerrit Code Review <review@openstack.org>2014-04-04 22:46:19 +0000
commitd733315bb123d76ffb5aaf819c3d0a7fb0fc007b (patch)
tree0a00f7c02a31ff91936551aebd9bb97ea2469f0d
parente9973ad72861ffbbacb0d4471ea7afc80ce31fe8 (diff)
parent5f46439856383e4981e692e5e8b622663006956d (diff)
downloadcliff-d733315bb123d76ffb5aaf819c3d0a7fb0fc007b.tar.gz
Merge "Import run_cross_tests.sh from oslo-incubator"
-rw-r--r--openstack-common.conf7
-rwxr-xr-xtools/run_cross_tests.sh70
2 files changed, 77 insertions, 0 deletions
diff --git a/openstack-common.conf b/openstack-common.conf
new file mode 100644
index 0000000..f852c52
--- /dev/null
+++ b/openstack-common.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+
+# The list of modules to copy from oslo-incubator.git
+script = tools/run_cross_tests.sh
+
+# The base module to hold the copy of openstack.common
+base=cliff
diff --git a/tools/run_cross_tests.sh b/tools/run_cross_tests.sh
new file mode 100755
index 0000000..fb21e65
--- /dev/null
+++ b/tools/run_cross_tests.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# Run cross-project tests
+
+# Fail the build if any command fails
+set -e
+
+project_dir="$1"
+venv="$2"
+
+# Set up the virtualenv without running the tests
+(cd $project_dir && tox --notest -e $venv)
+
+tox_envbin=$project_dir/.tox/$venv/bin
+
+our_name=$(python setup.py --name)
+
+# Replace the pip-installed package with the version in our source
+# tree. Look to see if we are already installed before trying to
+# uninstall ourselves, to avoid failures from packages that do not use us
+# yet.
+if $tox_envbin/pip freeze | grep -q $our_name
+then
+ $tox_envbin/pip uninstall -y $our_name
+fi
+$tox_envbin/pip install -U .
+
+# Run the tests
+(cd $project_dir && tox -e $venv)
+result=$?
+
+
+# The below checks are modified from
+# openstack-infra/config/modules/jenkins/files/slave_scripts/run-unittests.sh.
+
+# They expect to be run in the project being tested.
+cd $project_dir
+
+echo "Begin pip freeze output from test virtualenv:"
+echo "======================================================================"
+.tox/$venv/bin/pip freeze
+echo "======================================================================"
+
+# We only want to run the next check if the tool is installed, so look
+# for it before continuing.
+if [ -f /usr/local/jenkins/slave_scripts/subunit2html.py -a -d ".testrepository" ] ; then
+ if [ -f ".testrepository/0.2" ] ; then
+ cp .testrepository/0.2 ./subunit_log.txt
+ elif [ -f ".testrepository/0" ] ; then
+ .tox/$venv/bin/subunit-1to2 < .testrepository/0 > ./subunit_log.txt
+ fi
+ .tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
+ gzip -9 ./subunit_log.txt
+ gzip -9 ./testr_results.html
+
+ export PYTHON=.tox/$venv/bin/python
+ set -e
+ rancount=$(.tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
+ if [ "$rancount" -eq "0" ] ; then
+ echo
+ echo "Zero tests were run. At least one test should have been run."
+ echo "Failing this test as a result"
+ echo
+ exit 1
+ fi
+fi
+
+# If we make it this far, report status based on the tests that were
+# run.
+exit $result