From 03a71f316b4302751d3344125f2f9081591948e1 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 30 Aug 2016 16:36:22 +0200 Subject: reproducible Debian: add jobs to test strip-nondeterminism and disorderfs on every commit, one job each for the master branch, another (each) for the rest --- job-cfg/reproducible.yaml | 41 ++++++++++++++++++++++++++++++++++++---- logparse/debian-diffoscope.rules | 31 ------------------------------ logparse/debian-pkg-ci.rules | 31 ++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 35 deletions(-) delete mode 100644 logparse/debian-diffoscope.rules create mode 100644 logparse/debian-pkg-ci.rules diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 7dea26b7..17fafe70 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -698,11 +698,13 @@ my_timed: '42 23 1 1 *' my_hname: 'profitbricks3' my_gitrepo: 'https://gitlab.com/fdroid/fdroidserver.git' + my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - 'setup_fdroid_build_environment_profitbricks4': my_description: 'Setup a build environment for F-Droid.' my_timed: '42 23 1 1 *' my_hname: 'profitbricks4' my_gitrepo: 'https://gitlab.com/fdroid/fdroidserver.git' + my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - 'diffoscope_from_git_master': my_description: 'Build diffoscope Debian package from git branch master.' my_timed: '42 23 1 1 *' @@ -710,8 +712,7 @@ 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_recipients: 'jenkins+debian-reproducible qa-jenkins-scm@lists.alioth.debian.org' - my_parse_rules: '/srv/jenkins/logparse/debian-diffoscope.rules' + 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 *' @@ -719,9 +720,41 @@ 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_recipients: 'jenkins+debian-reproducible qa-jenkins-scm@lists.alioth.debian.org' - my_parse_rules: '/srv/jenkins/logparse/debian-diffoscope.rules' + my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' + - 'strip-nondeterminism_from_git_master': + my_description: 'Build strip-nondeterminism Debian package from git branch master.' + my_timed: '42 23 1 1 *' + my_hname: '' + my_gitrepo: 'git://anonscm.debian.org/git/reproducible/strip-nondeterminism.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' + - 'strip-nondeterminism_from_git_branches': + my_description: 'Build strip-nondeterminism Debian package from git branches other than master.' + my_timed: '42 23 1 1 *' + my_hname: '' + my_gitrepo: 'git://anonscm.debian.org/git/reproducible/strip-nondeterminism.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' + - 'disorderfs_from_git_master': + my_description: 'Build disorderfs Debian package from git branch master.' + my_timed: '42 23 1 1 *' + my_hname: '' + my_gitrepo: 'git://anonscm.debian.org/git/reproducible/disorderfs.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' + - 'disorderfs_from_git_branches': + my_description: 'Build disorderfs Debian package from git branches other than master.' + my_timed: '42 23 1 1 *' + my_hname: '' + my_gitrepo: 'git://anonscm.debian.org/git/reproducible/disorderfs.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' my_gitbranches: 'master' + my_recipients: 'jenkins+debian-reproducible qa-jenkins-scm@lists.alioth.debian.org' my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules' my_hname: '' diff --git a/logparse/debian-diffoscope.rules b/logparse/debian-diffoscope.rules deleted file mode 100644 index df8c150b..00000000 --- a/logparse/debian-diffoscope.rules +++ /dev/null @@ -1,31 +0,0 @@ -# see https://wiki.jenkins-ci.org/display/JENKINS/Log+Parser+Plugin - -ok /not really/ - -ok /Error while decoding stream/ - -# ignore images… -ok /warning\.png/ - -# match line starting with 'error ', case-insensitive -error /(?i)^error / - -# ignore some stuff -ok /update-binfmts: warning:/ -ok /update-rc.d: warning: start and stop actions are no longer supported/ -ok /E: Can not write log \(Is /dev/pts mounted/ -ok /Warning: there was a problem reading the certificate file \/etc\/ssl\/certs/ -ok /dpkg-buildpackage: warning: using a gain-root-command while being root/ -ok /warning: the authors of lintian do not recommend running it with root privileges/ -ok /test_no_warnings PASSED/ - -# list of warnings here... -warning /[Ww]arning/ -warning /WARNING/ - -# catch lintian warnings and errors -warning /^W: / -warning /^E: / - - - diff --git a/logparse/debian-pkg-ci.rules b/logparse/debian-pkg-ci.rules new file mode 100644 index 00000000..df8c150b --- /dev/null +++ b/logparse/debian-pkg-ci.rules @@ -0,0 +1,31 @@ +# see https://wiki.jenkins-ci.org/display/JENKINS/Log+Parser+Plugin + +ok /not really/ + +ok /Error while decoding stream/ + +# ignore images… +ok /warning\.png/ + +# match line starting with 'error ', case-insensitive +error /(?i)^error / + +# ignore some stuff +ok /update-binfmts: warning:/ +ok /update-rc.d: warning: start and stop actions are no longer supported/ +ok /E: Can not write log \(Is /dev/pts mounted/ +ok /Warning: there was a problem reading the certificate file \/etc\/ssl\/certs/ +ok /dpkg-buildpackage: warning: using a gain-root-command while being root/ +ok /warning: the authors of lintian do not recommend running it with root privileges/ +ok /test_no_warnings PASSED/ + +# list of warnings here... +warning /[Ww]arning/ +warning /WARNING/ + +# catch lintian warnings and errors +warning /^W: / +warning /^E: / + + + -- cgit v1.2.3-70-g09d2