From 0af7e6310b1f1058e824d6372444c685f5e3528a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 23 May 2017 17:37:46 +0200 Subject: reproducible Fdroid: prevent the two fdroid jobs from running together by using the Build Blocker Plugin Signed-off-by: Holger Levsen --- INSTALL | 1 + job-cfg/reproducible.yaml | 70 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 8f5ee097..bbd08845 100644 --- a/INSTALL +++ b/INSTALL @@ -43,6 +43,7 @@ We would prefer to run a jenkins package from jessie-backports. * Console Column Plugin * Priority Sorter Plugin * Throttle Concurrent Builds Plugin +* Build Blocker Plugin * Naginator Plugin * Next Executions * Parameterized Trigger plugin diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 1df3e732..f7b61988 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -90,6 +90,22 @@ parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules' - email: *email +- defaults: + <<: *DEFAULTS + name: reproducible_other_projects_blocked + publishers: + - logparser: &logparser-extra + <<: *logparser + parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules' + - email: *email + properties: + - sidebar: *sb1 + - sidebar: *sb2 + - sidebar: *sb3 + - build-blocker: + use-build-blocker: true + blocking-jobs: '{my_blocker} + - defaults: <<: *DEFAULTS name: reproducible_other_projects_git @@ -109,6 +125,32 @@ branches: - '{my_gitbranches}' +- defaults: + <<: *DEFAULTS + name: reproducible_other_projects_git_blocked + triggers: + - timed: '{my_timed}' + - pollscm: + cron: '*/6 * * * *' + publishers: + - logparser: + <<: *logparser + parse-rules: '{my_parse_rules}' + - email: *email + - naginator: *naginator + scm: + - git: + url: '{my_gitrepo}' + branches: + - '{my_gitbranches}' + properties: + - sidebar: *sb1 + - sidebar: *sb2 + - sidebar: *sb3 + - build-blocker: + use-build-blocker: true + blocking-jobs: '{my_blocker} + - defaults: <<: *DEFAULTS name: reproducible_other_projects_git_junit_exports @@ -173,10 +215,18 @@ defaults: reproducible_other_projects name: '{name}_{otherproject}' +- job-template: + defaults: reproducible_other_projects_blocked + name: '{name}_{otherproject_blocked}' + - job-template: defaults: reproducible_other_projects_git name: '{name}_{otherproject_git}' +- job-template: + defaults: reproducible_other_projects_git_blocked + name: '{name}_{otherproject_git_blocked}' + - job-template: defaults: reproducible_other_projects_git_junit_exports name: '{name}_{otherproject_git_junit_exports}' @@ -517,13 +567,31 @@ my_timed: '42 23 1 1 *' my_hname: 'profitbricks4' my_disabled: true + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' + my_hname: '' + + - '{name}_{otherproject_blocked}': + otherproject_blocked: - 'setup_fdroid_build_environment': my_description: 'Setup a build environment for F-Droid.' my_timed: '42 0 * * 1' my_hname: 'profitbricks7' my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm@lists.alioth.debian.org hans@guardianproject.info michael.poehn@fsfe.org' + my_blocker: '^reproducible.*fdroid.*' my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_hname: '' + + - '{name}_{otherproject_git_blocked}': + otherproject_git_blocked: + - 'fdroid_build_apps': + my_description: 'Build all the latest apps for F-Droid.' + my_timed: '42 7 * * 1' + my_hname: 'profitbricks7' + my_gitrepo: 'https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net.git' + my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm@lists.alioth.debian.org hans@guardianproject.info michael.poehn@fsfe.org' + my_blocker: '^reproducible.*fdroid.*' + my_gitbranches: 'master' + my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' + my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules' - '{name}_{otherproject_git}': otherproject_git: -- cgit v1.2.3-54-g00ecf