From 77e17ba5de69fe3213d9fbe1ab17619a1cc9f0b6 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 13 Oct 2015 12:08:01 +0200 Subject: reproducible: run coreboot/openwrt/netbsd/freebsd jobs correctly via node_wrapper --- bin/jenkins_node_wrapper.sh | 8 ++++++++ job-cfg/reproducible.yaml | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index 8286c4a9..54acbe03 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -91,6 +91,14 @@ elif [[ "$*" =~ reproducible_setup_schroot_testing_.*_.* ]] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing ; croak "Exec failed"; elif [[ "$*" =~ reproducible_setup_schroot_experimental_.*_.* ]] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_coreboot ]] ; then + exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_openwrt ]] ; then + exec /srv/jenkins/bin/reproducible_openwrt.sh ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_netbsd ]] ; then + exec /srv/jenkins/bin/reproducible_netbsd.sh ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_freebsd ]] ; then + exec /srv/jenkins/bin/reproducible_freebsd.sh ; croak "Exec failed"; elif [ "$*" = "some_jenkins_job_name" ] ; then exec echo run any commands here ; croak "Exec failed"; fi diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 1fa0d0c5..a6aee612 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -762,13 +762,13 @@ - '{name}_setup_schroot_unstable_diffoscope_amd64_jenkins': my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)' my_timed: '42 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' + my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_setup_schroot_unstable_diffoscope_amd64_profitbricks3': my_description: 'Setup schroot for running diffoscope in a unstable environment' my_timed: '42 0 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' - '{name}_setup_schroot_testing_diffoscope_amd64_jenkins': @@ -1227,25 +1227,25 @@ - '{name}_coreboot': my_description: 'Rebuild all coreboot ROMs twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 1' - my_shell: '/srv/jenkins/bin/reproducible_coreboot.sh' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' - '{name}_openwrt': my_description: 'Rebuild OpenWrt (some targets, some packages) twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 2' - my_shell: '/srv/jenkins/bin/reproducible_openwrt.sh' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' - '{name}_netbsd': my_description: 'Rebuild NetBSD (for some archs) twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 3' - my_shell: '/srv/jenkins/bin/reproducible_netbsd.sh' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' - '{name}_freebsd': my_description: 'Rebuild FreeBSD twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 4' - my_shell: '/srv/jenkins/bin/reproducible_freebsd.sh' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' -- cgit v1.2.3-54-g00ecf