From ff31fdef5766f698b4dbafc9cdb244426311874e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 12 Nov 2015 13:46:48 +0100 Subject: prevent shell script based jobs to be run on the jenkins test system --- bin/common-functions.sh | 4 ++++ bin/jenkins_master_wrapper.sh | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/bin/common-functions.sh b/bin/common-functions.sh index f17fd264..f809cdb9 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -18,6 +18,10 @@ common_cleanup(){ common_init() { # check whether this script has been started from /tmp already if [ "${0:0:5}" != "/tmp/" ] ; then + if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then + echo "$(date -u) - running on $HOSTNAME, exiting successfully and cleanly immediatly." + exit 0 + fi # check that we are not root if [ $(id -u) -eq 0 ] ; then echo "Do not run this as root." diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 0eb61b77..0b60c8e3 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -2,6 +2,14 @@ set -u set -e + +# don't try to run on test system +if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then + echo "$(date -u) - running on $HOSTNAME, exiting successfully and cleanly immediatly." + exit 0 +fi + +# real start PARAMS="$JOB_NAME" # these nodes also need to be listed in bin/reproducible_common.sh where they define $BUILD_NODES -- cgit v1.2.3-70-g09d2