[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: another stab at fixing the disorderfs and reprotests jobs

[Holger Levsen]

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


Commits:
94c170f1 by Holger Levsen at 2018-10-25T11:48:53Z
reproducible: another stab at fixing the disorderfs and reprotests jobs

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

- - - - -


2 changed files:

- bin/chroot-run.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/chroot-run.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2012-2018 Holger Levsen <holger at layer-acht.org>
 # Copyright      2013 Antonio Terceiro <terceiro at 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
=====================================
@@ -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.'



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/94c170f15954250d2b766081a67c36978e6a5434
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/20181025/d80a8e5a/attachment-0001.html>