[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] fixup 3536450a: haskell-package-plan: move this job to pb10

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
184bafb9 by Holger Levsen at 2018-11-13T15:58:17Z
fixup 3536450a: haskell-package-plan: move this job to pb10

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- bin/jenkins_master_wrapper.sh
- bin/jenkins_node_wrapper.sh
- job-cfg/haskell-package-plan.yaml


Changes:

=====================================
bin/jenkins_master_wrapper.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2015-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2018 Holger Levsen <holger at layer-acht.org>
 #                2016 Phil Hands <phil at hands.com>
 #           2018      Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv=2
@@ -27,9 +27,9 @@ RETRIEVE_ARTIFACTS=no
 # add some more params if needed,
 # by default we just use the job name as param
 case $JOB_NAME in
-	rebootstrap_*|chroot-installation_*)
-		PARAMS="$JOB_NAME $@"
-		;;
+	rebootstrap_*|chroot-installation_*|haskell-package-plan)
+			PARAMS="$JOB_NAME $@"
+			;;
 	*)		PARAMS="$JOB_NAME"
 			;;
 esac


=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -79,6 +79,8 @@ elif [[ "$1" =~ ^chroot-installation_.* ]]; then
 	shift ; exec /srv/jenkins/bin/chroot-installation.sh $@ ; croak "Exec failed"
 elif [ "$*" = "reproducible_nodes_info" ] ; then
 	exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed";
+elif [ "$*" = "haskell-package-plan" ] ; then
+	shift ; exec /srv/jenkins/bin/chroot-run.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" "$6" ; croak "Exec failed";
 elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /srv/workspace/chroots/.* ]] ; then


=====================================
job-cfg/haskell-package-plan.yaml
=====================================
@@ -21,7 +21,7 @@
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     builders:
-      - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} "apt-get --no-install-recommends -y install {my_pkgs}; {my_shell}"'
+      - shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh haskell-package-plan {my_distro} "apt-get --no-install-recommends -y install {my_pkgs}; {my_shell}"'
     publishers:
       - logparser:
           parse-rules: '/srv/jenkins/logparse/haskell-package-plan.rules'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/184bafb92cb68735747b997da508f19b785a5453

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/184bafb92cb68735747b997da508f19b785a5453
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181113/d9bbe4a5/attachment-0001.html>