From a5798bf080df2fe2cd31539c4e926740ffbbcd11 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 4 Sep 2012 09:53:04 -0700 Subject: [PATCH] Check tox runs for sudo attempts. 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 Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/run-tox.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 0f22e42175..8a5a6c3c30 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -1,4 +1,4 @@ -#!/bin/bash -xe +#!/bin/bash -x # If a bundle file is present, call tox with the jenkins version of # 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_HTML_OUT_FILE='nose_results.html' +sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre + tox -e$venv result=$? @@ -34,4 +36,16 @@ echo "======================================================================" .tox/$venv/bin/pip freeze 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