opendev/system-config
Code Issues Proposed changes

Check tox runs for sudo attempts.

Browse Source 
If Jenkins has attempted to sudo during a tox run, fail the
test.

Also, remove "-e" from run-tox, so that pip freeze always runs.

Change-Id: I98230e4de03667f15f119fac45e1eba0ac249c1c
Reviewed-on: https://review.openstack.org/12458
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-09-04 09:53:04 -07:00 committed by Jenkins
parent a80f3b17e1
commit a5798bf080
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/jenkins/files/slave_scripts/run-tox.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash -xe #!/bin/bash -x
# If a bundle file is present, call tox with the jenkins version of # If a bundle file is present, call tox with the jenkins version of
# the test environment so it is used. Otherwise, use the normal # the test environment so it is used. Otherwise, use the normal
@ -26,6 +26,8 @@ export NOSE_WITH_XUNIT=1
export NOSE_WITH_HTML_OUTPUT=1 export NOSE_WITH_HTML_OUTPUT=1
export NOSE_HTML_OUT_FILE='nose_results.html' export NOSE_HTML_OUT_FILE='nose_results.html'
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
tox -e$venv tox -e$venv
result=$? result=$?
@ -34,4 +36,16 @@ echo "======================================================================"
.tox/$venv/bin/pip freeze .tox/$venv/bin/pip freeze
echo "======================================================================" echo "======================================================================"
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh post
sudoresult=$?
if [ $sudoresult -ne "0" ]
then
echo
echo "This test has failed because it attempted to execute commands"
echo "with sudo. See above for the exact commands used."
echo
exit 1
fi
exit $result exit $result