summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/jenkins_master_wrapper.sh3
-rwxr-xr-xbin/jenkins_node_wrapper.sh3
-rwxr-xr-xbin/lvc.sh3
3 files changed, 1 insertions, 8 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh
index ed9f3069..72037c84 100755
--- a/bin/jenkins_master_wrapper.sh
+++ b/bin/jenkins_master_wrapper.sh
@@ -77,9 +77,6 @@ if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then
mkdir -p "$RESULTS"
rsync -r --delete -v -e "ssh -o 'Batchmode = yes' -p $PORT" "$NODE_NAME:$NODE_RESULTS/" "$RESULTS/"
ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -r $NODE_RESULTS"
- ls -lad "$RESULTS"
- ls -la "$RESULTS"
- echo "WORKSPACE=$WORKSPACE"
fi
exit $RETVAL
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 2e239547..c2c8875c 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -72,9 +72,6 @@ elif [[ "$*" =~ ^rebootstrap_.* ]] ; then
export LC_ALL=C
exec $REBOOTSTRAPSH; croak "Exec failed";
elif [[ "$*" =~ ^lvc_.* ]] ; then
- echo debug begin
- export
- echo debug end
export JOB_NAME=$1 ; shift
export EXECUTOR_NUMBER=$1 ; shift
export TRIGGERING_BRANCH=${1#*=} ; shift
diff --git a/bin/lvc.sh b/bin/lvc.sh
index f4ff4e25..f74ced03 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -4,7 +4,7 @@
# Copyright 2016 Philip Hands <phil@hands.com>
# released under the GPLv=2
-DEBUG=true
+DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
@@ -83,7 +83,6 @@ discard_snapshots() {
if [ -z "$WORKSPACE" ] ; then
WORKSPACE=$PWD
fi
-echo WORKSPACE=$WORKSPACE
RESULTS=$WORKSPACE/results
IMAGE=$WORKSPACE/$(basename $URL)