From aeb729c95e316f0d745da300f386f742c6cd5efd Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 10 Sep 2015 16:24:07 +0200 Subject: reproducible: remove one legacy amd64 build job, add two new-style amd64 build jobs --- TODO | 2 +- job-cfg/reproducible.yaml | 38 ++++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/TODO b/TODO index 3b6720a9..8540fb8f 100644 --- a/TODO +++ b/TODO @@ -175,7 +175,7 @@ properties: *** handle_unhandled() needs to unregister the build from the db too *** diffoscope needs to be run on the target arch... **** should probably be doable with qemu-static on the host -*** once all non remote build jobs are removed, remove the legacy code from _build.sh +*** once all non remote build jobs are removed, remove the legacy code from _build.sh, turn debug off ** setup builder3, distribute more ressources ** explain status in plain english on each coreboot/openwrt/netbsd/freebsd page, also on the Debian dashboard plus add an "executive summary about reproducible builds in the free software world" *** get the content for "

status of $1

" from notes.git/friends.yaml or such diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index d7491b0d..8067994e 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -372,10 +372,6 @@ defaults: reproducible_builder name: '{name}_builder_gamma' -- job-template: - defaults: reproducible_builder - name: '{name}_builder_delta' - - job-template: defaults: reproducible_builder name: '{name}_builder_amd64_1' @@ -416,6 +412,14 @@ defaults: reproducible_builder name: '{name}_builder_amd64_10' +- job-template: + defaults: reproducible_builder + name: '{name}_builder_amd64_11' + +- job-template: + defaults: reproducible_builder + name: '{name}_builder_amd64_12' + - job-template: defaults: reproducible_builder name: '{name}_builder_armhf_1' @@ -774,12 +778,6 @@ my_shell: '/srv/jenkins/bin/reproducible_build.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - - '{name}_builder_delta': - my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' - my_timed: 'H/2 * * * *' - my_shell: '/srv/jenkins/bin/reproducible_build.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: '' - '{name}_builder_amd64_1': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' @@ -789,7 +787,7 @@ - '{name}_builder_amd64_2': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' - my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_builder_amd64_3': @@ -801,7 +799,7 @@ - '{name}_builder_amd64_4': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' - my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_builder_amd64_5': @@ -819,7 +817,7 @@ - '{name}_builder_amd64_7': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' - my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_builder_amd64_8': @@ -831,7 +829,7 @@ - '{name}_builder_amd64_9': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' - my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_builder_amd64_10': @@ -840,6 +838,18 @@ my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' + - '{name}_builder_amd64_11': + my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' + my_timed: 'H/2 * * * *' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64' + my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' + my_node: '' + - '{name}_builder_amd64_12': + my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' + my_timed: 'H/2 * * * *' + my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64' + my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' + my_node: '' - '{name}_builder_armhf_1': my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.' my_timed: 'H/2 * * * *' -- cgit v1.2.3-54-g00ecf