[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: do disorderfs ci builds using debuild, not gbp (and rename r-b $pkg ci jobs)

[Holger Levsen]

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


Commits:
24e8e746 by Holger Levsen at 2020-06-17T01:50:37+02:00
reproducible: do disorderfs ci builds using debuild, not gbp (and rename r-b $pkg ci jobs)

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

- - - - -


2 changed files:

- bin/common-functions.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -218,7 +218,7 @@ jenkins_zombie_check() {
 	# and we dont know why and when that happens,
 	# so just report those zombies here.
 	#
-	ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_branches' || true)
+	ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master' || true)
 	if [ ! -z "$ZOMBIES" ] ; then
 		DIRTY=true
 		figlet 'zombies!!!'


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -866,12 +866,12 @@
 
         - '{name}_{otherproject_git}':
             otherproject_git:
-                - 'disorderfs_from_git_master':
-                    my_description: 'Build disorderfs Debian package from git branch master.'
+                - 'disorderfs_from_git':
+                    my_description: 'Build disorderfs Debian package from git branch "debian"'
                     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 --git-debian-branch=debian'
+                    my_gitbranches: 'origin/debian'
+                    my_shell: '/srv/jenkins/bin/chroot-run.sh sid --exports-results debuild -e JENKINS_EXPORTS_DIR -uc -us'
                     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.'
@@ -903,8 +903,8 @@
 
         - '{name}_{otherproject_git_junit_exports}':
             otherproject_git_junit_exports:
-             - 'diffoscope_from_git_master':
-                my_description: 'Build diffoscope Debian package from git branch master.'
+             - 'diffoscope_from_git':
+                my_description: 'Build diffoscope Debian package from git branch "master".'
                 my_gitbranches: 'origin/master'
             my_timed: '42 23 1 1 *'
             my_gitrepo: 'https://salsa.debian.org/reproducible-builds/diffoscope.git'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/24e8e746a96d52e8485a7877b1826d9d0a152644

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/24e8e746a96d52e8485a7877b1826d9d0a152644
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/20200616/ab7000a4/attachment-0001.html>