Commit 184bafb9 authored by Holger Levsen's avatar Holger Levsen
Browse files

fixup 3536450a: haskell-package-plan: move this job to pb10 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 3536450a

bin/jenkins_master_wrapper.sh

+4 −4
Original line number Diff line number Diff line 
#!/bin/bash

# vim: set noexpandtab:



# Copyright 2015-2017 Holger Levsen <holger@layer-acht.org>

# Copyright 2015-2018 Holger Levsen <holger@layer-acht.org>

#                2016 Phil Hands <phil@hands.com>

#           2018      Mattia Rizzolo <mattia@debian.org>

# released under the GPLv=2
@@ -27,7 +27,7 @@ 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_*)

	rebootstrap_*|chroot-installation_*|haskell-package-plan)

			PARAMS="$JOB_NAME $@"

			;;

	*)		PARAMS="$JOB_NAME"

bin/jenkins_node_wrapper.sh

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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'