summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-07-22 14:45:25 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-22 13:20:30 -0400
commit40a9e3deebaeb3d9415dc39ac153f038e7c3aaa8 (patch)
treeba5c5fb5bc34d5b2ef35af235c6a3b11644a8a69
parentb0476ce863ecfb8ec7acf68708a40916a80bdbfa (diff)
downloadjenkins.debian.net-40a9e3deebaeb3d9415dc39ac153f038e7c3aaa8.tar.xz
anchor wrapper patterns, and put results in the right place
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/jenkins_master_wrapper.sh9
-rwxr-xr-xbin/jenkins_node_wrapper.sh23
2 files changed, 14 insertions, 18 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh
index 61b5d234..ea3c6383 100755
--- a/bin/jenkins_master_wrapper.sh
+++ b/bin/jenkins_master_wrapper.sh
@@ -70,15 +70,12 @@ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "$PARAMS" || {
# grab artifacts and tidy up at the other end
if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then
- RESULTS="$WORKSPACE/results"
- NODE_RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results"
+ RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results"
echo "$(date -u) - retrieving artifacts."
set -x
- mkdir -p $RESULTS
- rsync -r -v -e "ssh -o 'Batchmode = yes'" "$NODE_NAME:$NODE_RESULTS/" "$RESULTS/"
- chmod 775 /$WORKSPACE/results/
- ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -rf '$NODE_RESULTS'"
+ rsync -r -v -e "ssh -o 'Batchmode = yes' -p $PORT" "$NODE_NAME:$RESULTS/" "$RESULTS/"
+ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -r '$RESULTS'"
fi
exit $RETVAL
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index ea95a9c5..ff68ef1a 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -58,46 +58,45 @@ shift
allowed_cmds=()
-if [[ "$*" =~ /bin/true ]] ; then
+if [[ "$*" = "/bin/true" ]] ; then
exec /bin/true ; croak "Exec failed";
elif [[ "$*" = "cleanup_nodes /srv/jenkins/bin/reproducible_slay.sh" ]] ; then
exec /srv/jenkins/bin/reproducible_slay.sh ; croak "Exec failed";
-elif [[ "$*" =~ /bin/nc\ localhost\ 4949 ]] ; then
+elif [[ "$*" =~ ^/bin/nc\ localhost\ 4949 ]] ; then
exec /bin/nc localhost 4949 ; croak "Exec failed";
elif [[ "$*" =~ rebootstrap_.* ]] ; then
shift
REBOOTSTRAPSH="/srv/jenkins/bin/rebootstrap.sh $@"
export LC_ALL=C
exec $REBOOTSTRAPSH; croak "Exec failed";
-elif [[ "$*" =~ lvc_.* ]] ; then
+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
- export WORKSPACE=~jenkins/jobs/$JOB_NAME/workspace
COMMAND="/srv/jenkins/bin/lvc.sh $@"
exec $COMMAND; croak "Exec failed";
elif [ "$*" = "reproducible_nodes_info" ] ; then
exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed";
elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
exec /srv/jenkins/bin/reproducible_build.sh "$2" "$3" "$4" "$5" ; croak "Exec failed";
-elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/.* ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /srv/reproducible-results/.* ]] ; then
exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
-elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /var/lib/jenkins/userContent/reproducible/.* ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/userContent/reproducible/.* ]] ; then
exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
-elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /var/lib/jenkins/jobs/lvc_.*/workspace/results/.* ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/jobs/lvc_[-_a-z]*/workspace/results/ ]] ; then
exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
-elif [[ "$*" =~ rsync\ --server\ .*\ \.\ /srv/d-i/isos/ ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ .*\ \.\ /srv/d-i/isos/ ]] ; then
exec rsync --server "$3" . "$5" ; croak "Exec failed";
-elif [[ "$*" =~ mkdir\ -p\ /srv/d-i/isos.* ]] ; then
+elif [[ "$*" =~ ^mkdir\ -p\ /srv/d-i/isos.* ]] ; then
exec mkdir -p "$3" ; croak "Exec failed";
-elif [[ "$*" =~ rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then
+elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then
exec rm -r "$3" ; croak "Exec failed";
-elif [[ "$*" =~ rm\ -r\ /srv/reproducible-results/rbuild.* ]] ; then
+elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/rbuild.* ]] ; then
exec rm -r "$3" ; croak "Exec failed";
-elif [[ "$*" =~ rm\ -r\ /var/lib/jenkins/jobs/lvc_.*/workspace/results ]] ; then
+elif [[ "$*" =~ ^rm\ -r\ /var/lib/jenkins/jobs/lvc_.*/workspace/results ]] ; then
exec rm -r "$3" ; croak "Exec failed";
elif [[ "$*" =~ reproducible_setup_pbuilder_unstable_.*_.* ]] ; then
exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed";