diff options
| author | Philip Hands <phil@hands.com> | 2015-12-14 00:59:44 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-14 01:20:01 +0100 |
| commit | dafb3c2133fab04f95ebc72b68048ce747221342 (patch) | |
| tree | 395a714abb57577f844987c89e431a91b858163a | |
| parent | 42c65669626ab748c9a1fbf31f4e00b19f5d52ce (diff) | |
| download | jenkins.debian.net-dafb3c2133fab04f95ebc72b68048ce747221342.tar.xz | |
tidy setup_schroot jobs a bit
| -rw-r--r-- | job-cfg/reproducible.yaml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index f8c8ec14..28bd284e 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -214,6 +214,10 @@ name: '{name}_{my_task}_{my_arch}_{my_hname}' - job-template: + defaults: reproducible + name: '{name}_setup_schroot_{my_distro}_{my_arch}_{my_hname}' + +- job-template: defaults: reproducible_builder name: '{name}_builder_{my_arch}_{my_num}' @@ -312,29 +316,25 @@ - 'profitbricks6': { my_arch: 'amd64' } my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - - '{name}_{my_task}_{my_arch}_{my_hname}': - # FIXME: should define my_dstro an paramaterise the rest, but that will probably change job names, so let's leave it for now -- fil - my_task: - - 'setup_schroot_unstable_diffoscope': + - '{name}_setup_schroot_{my_distro}_{my_arch}_{my_hname}': + my_distro: + - 'unstable_diffoscope': 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/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all' - - 'setup_schroot_testing_diffoscope': + - 'testing_diffoscope': my_description: 'Setup schroot for running diffoscope in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' my_timed: '23 0 * * *' my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-diffoscope testing diffoscope locales-all' - - 'setup_schroot_unstable': - my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.' + - 'unstable': my_timed: '42 1 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch' - - 'setup_schroot_testing': - my_description: 'Setup testing schroot for fetching source packages for the builder jobs.' + my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro} botch' + - 'testing': my_timed: '42 1 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing' - - 'setup_schroot_experimental': - my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.' + - 'experimental': my_timed: '33 1 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental' + my_description: 'Setup {my_distro} schroot for fetching source packages for the builder jobs.' + my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}' my_hname: - 'jenkins': { my_arch: 'amd64' } my_node: '' |