Commit 94c170f1 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible: another stab at fixing the disorderfs and reprotests jobs 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 35681ad2

bin/chroot-run.sh

+1 −3
Original line number Diff line number Diff line 
#!/bin/bash



# Copyright 2012-2017 Holger Levsen <holger@layer-acht.org>

# Copyright 2012-2018 Holger Levsen <holger@layer-acht.org>

# Copyright      2013 Antonio Terceiro <terceiro@debian.org>

# released under the GPLv=2
@@ -179,8 +179,6 @@ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins 
apt-get install build-essential devscripts git

if [ "$1" = "gbp" ] ; then

	apt-get install git-buildpackage

	# there are only two jobs using this and both have no debian directory in the master branch

	git merge origin/debian

fi

if [ -f debian/control ] ; then

	cat debian/control

job-cfg/reproducible.yaml

+2 −2
Original line number Diff line number Diff line
@@ -707,14 +707,14 @@ 
                    my_timed: '42 23 1 1 *'

                    my_gitrepo: 'https://salsa.debian.org/reproducible/strip-nondeterminism.git'

                    my_gitbranches: 'origin/master'

                    my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master'

                    my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master --git-debian-branch=debian'

                    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_gitrepo: 'https://salsa.debian.org/reproducible-builds/disorderfs.git'

                    my_gitbranches: 'origin/master'

                    my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master'

                    my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master --git-debian-branch=debian'

                    my_parse_rules: '/srv/jenkins/logparse/debian-pkg-ci.rules'

                - 'builds_website':

                    my_description: 'Build https://reproducible-builds.org on every git commit to {my_gitrepo} with jekyll.'