[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: fix the disorderfs and strip-nondeterminism jobs to really test…

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
ca2e682c by Holger Levsen at 2018-10-17T20:28:50Z
reproducible: fix the disorderfs and strip-nondeterminism jobs to really test the master branch (and not the debian branch)

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/chroot-run.sh


Changes:

=====================================
bin/chroot-run.sh
=====================================
@@ -179,8 +179,8 @@ 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
-	# either there is a debian branch or not
-	git checkout debian || echo "No debian branch exists, assuming packaging is in master branch."
+	# there are only two jobs using this and both have no debian directory in the master branch
+	git merge debian
 fi
 if [ -f debian/control ] ; then
 	cat debian/control



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/ca2e682c59ad176c1d977081b173be22bc77b0c2

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/ca2e682c59ad176c1d977081b173be22bc77b0c2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181017/f83dbd6f/attachment-0001.html>