summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-08-11 01:42:33 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-11 01:42:33 +0200
commit21b5afc40c5fa3d0078f52b560d9ce7e03f7e4d1 (patch)
treede3eed59bc52e247ba264d488bb653d3e22c65ed
parent7482821a06df2133108f9ccf76889a08d0d53d20 (diff)
downloadjenkins.debian.net-21b5afc40c5fa3d0078f52b560d9ce7e03f7e4d1.tar.xz
lvc: lets agree on a path
-rwxr-xr-xbin/jenkins_master_wrapper.sh2
-rwxr-xr-xbin/jenkins_node_wrapper.sh7
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh
index cf523941..44a99524 100755
--- a/bin/jenkins_master_wrapper.sh
+++ b/bin/jenkins_master_wrapper.sh
@@ -71,7 +71,7 @@ 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/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$JOB_NAME/workspace/results"
+ NODE_RESULTS="/var/lib/jenkins/srv/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$JOB_NAME/workspace/results"
echo "$(date -u) - retrieving artifacts."
set -x
mkdir -p "$RESULTS"
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 18eb65d9..6eaf8162 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -76,9 +76,8 @@ elif [[ "$*" =~ ^lvc_.* ]] ; then
export JOB_NAME=$1 ; shift
export EXECUTOR_NUMBER=$1 ; shift
export TRIGGERING_BRANCH=${1#*=} ; shift
- # FIXME: Phil, please, this is not my department, but we need to get the rockets down…
- # FIXME: there is a typo, the missing / prefix… but i want to get this rocket up now…
- export WORKSPACE=srv/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$JOB_NAME/workspace
+ # FIXME: hard-coding profitbricks-build10-amd64… and ~ there is ugly too…
+ export WORKSPACE=/var/lib/jenkins/srv/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$JOB_NAME/workspace/results
COMMAND="/srv/jenkins/bin/lvc.sh $@"
exec $COMMAND; croak "Exec failed";
elif [ "$*" = "reproducible_nodes_info" ] ; then
@@ -89,7 +88,7 @@ elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /srv/reproducible-results/.*
exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
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/jenkins/pseudo-hosts/.* ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/srv/jenkins/pseudo-hosts/.* ]] ; then
exec rsync --server --sender "$4" . "$6" ; croak "Exec failed";
elif [[ "$*" =~ ^rsync\ --server\ .*\ \.\ /srv/d-i/isos/ ]] ; then
exec rsync --server "$3" . "$5" ; croak "Exec failed";