summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-12 13:46:48 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-12 13:46:48 +0100
commitff31fdef5766f698b4dbafc9cdb244426311874e (patch)
tree874b02dc1d20d5f4351949115ebe8e708be4fb50
parent5d85758eb7aa76a1e7b18c122682fb35864ab876 (diff)
downloadjenkins.debian.net-ff31fdef5766f698b4dbafc9cdb244426311874e.tar.xz
prevent shell script based jobs to be run on the jenkins test system
-rwxr-xr-xbin/common-functions.sh4
-rwxr-xr-xbin/jenkins_master_wrapper.sh8
2 files changed, 12 insertions, 0 deletions
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