summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 7c713d1e..d46b89c8 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/workspace/$JOB_NAME/results"
- NODE_RESULTS="/var/lib/jenkins/srv/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$JOB_NAME/workspace/results"
+ NODE_RESULTS="/var/lib/jenkins/jobs/$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 7d3dac75..2e239547 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -78,8 +78,7 @@ elif [[ "$*" =~ ^lvc_.* ]] ; then
export JOB_NAME=$1 ; shift
export EXECUTOR_NUMBER=$1 ; shift
export TRIGGERING_BRANCH=${1#*=} ; shift
- # 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
+ export WORKSPACE=/var/lib/jenkins/jobs/$JOB_NAME/workspace
COMMAND="/srv/jenkins/bin/lvc.sh $@"
exec $COMMAND; croak "Exec failed";
elif [ "$*" = "reproducible_nodes_info" ] ; then
@@ -90,7 +89,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/srv/jenkins/pseudo-hosts/.* ]] ; then
+elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/jobs/.*/workspace/results/.* ]] ; 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";
@@ -100,7 +99,7 @@ elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then
exec rm -r "$3" ; croak "Exec failed";
elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/rbuild.* ]] ; then
exec rm -r "$3" ; croak "Exec failed";
-elif [[ "$*" =~ ^rm\ -r\ /var/lib/jenkins/srv/jenkins/pseudo-hosts/.* ]] ; then
+elif [[ "$*" =~ ^rm\ -r\ /var/lib/jenkins/jobs/.*/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";