From e5940eb70b3f22cec7da2f3d86faf6895e2cccd1 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 21 Nov 2016 16:55:28 +0100 Subject: reproducible Debian: fix jobs to build strip-nd and diso-fs from git master branch and remove jobs which build from branches Signed-off-by: Holger Levsen --- job-cfg/reproducible.yaml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 8bd75398..752f5900 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -809,15 +809,7 @@ 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 gbp buildpackage' - 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 gbp buildpackage' + my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage --git-upstream-branch=master' my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' - 'disorderfs_from_git_master': my_description: 'Build disorderfs Debian package from git branch master.' @@ -825,15 +817,7 @@ 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 gbp buildpackage' - 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 gbp buildpackage' + my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage --git-upstream-branch=master' my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules' - 'builds_website': my_description: 'Build https://reproducible-builds.org on every git commit to https://anonscm.debian.org/git/reproducible/reproducible-website.git with jekyll.' -- cgit v1.2.3-54-g00ecf