From 1ea7379b4f32b9c32ba798a1ddd65ed55553250e Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Wed, 17 May 2017 10:56:26 +0200 Subject: reproducible debian: tell the diffoscope job to look for the junit export file Signed-off-by: Mattia Rizzolo Signed-off-by: Holger Levsen --- job-cfg/reproducible.yaml | 56 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 16 deletions(-) (limited to 'job-cfg/reproducible.yaml') diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 722a1b03..dcb79374 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -109,6 +109,28 @@ branches: - '{my_gitbranches}' +- defaults: + <<: *DEFAULTS + name: reproducible_other_projects_git_junit_exports + triggers: + - timed: '{my_timed}' + - pollscm: + cron: '*/6 * * * *' + publishers: + - logparser: + <<: *logparser + parse-rules: '{my_parse_rules}' + - email: *email + - naginator: *naginator + - junit: + results: 'job-exports/test-results/*.xml' + allow-empty-results: 'true' + scm: + - git: + url: '{my_gitrepo}' + branches: + - '{my_gitbranches}' + - defaults: <<: *DEFAULTS name: reproducible_other_projects_trigger @@ -155,6 +177,10 @@ defaults: reproducible_other_projects_git name: '{name}_{otherproject_git}' +- job-template: + defaults: reproducible_other_projects_git_junit_exports + name: '{name}_{otherproject_git_junit_exports}' + - job-template: defaults: reproducible_other_projects_trigger name: '{name}_{otherproject_triggering}' @@ -507,22 +533,6 @@ 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' - - 'diffoscope_from_git_master': - my_description: 'Build diffoscope Debian package from git branch master.' - my_timed: '42 23 1 1 *' - my_hname: '' - my_gitrepo: 'git://anonscm.debian.org/git/reproducible/diffoscope.git' - my_gitbranches: 'origin/master' - my_shell: '/srv/jenkins/bin/chroot-run.sh sid debuild -uc -us' - my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' - - 'diffoscope_from_git_branches': - my_description: 'Build diffoscope Debian package from git branches other than master.' - my_timed: '42 23 1 1 *' - my_hname: '' - my_gitrepo: 'git://anonscm.debian.org/git/reproducible/diffoscope.git' - my_gitbranches: ':^(?!origin/master$).*' - my_shell: '/srv/jenkins/bin/chroot-run.sh sid debuild -uc -us' - my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' - 'reprotest_from_git_master': my_description: 'Build reprotest Debian package from git branch master.' my_timed: '42 23 1 1 *' @@ -560,6 +570,20 @@ my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules' my_hname: '' + - '{name}_{otherproject_git_junit_exports}': + otherproject_git_junit_exports: + - 'diffoscope_from_git_master': + my_description: 'Build diffoscope Debian package from git branch master.' + my_gitbranches: 'origin/master' + - 'diffoscope_from_git_branches': + my_description: 'Build diffoscope Debian package from git branches other than master.' + my_gitbranches: ':^(?!origin/master$).*' + my_timed: '42 23 1 1 *' + my_gitrepo: 'git://anonscm.debian.org/git/reproducible/diffoscope.git' + my_hname: '' + my_shell: '/srv/jenkins/bin/chroot-run.sh sid debuild -uc -us' + my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' + my_recipients: 'jenkins+debian-reproducible qa-jenkins-scm@lists.alioth.debian.org' - '{name}_builder_{otherproject}_{my_num}': otherproject: - 'archlinux': -- cgit v1.2.3-70-g09d2