[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: use botch in a schroot until it's available in jessie-backports

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 0efcefc4ce5b5c9d0ebd5a3d53ed658eee652ca8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 2 01:41:53 2015 +0200

    reproducible: use botch in a schroot until it's available in jessie-backports
---
 TODO                                     |  2 ++
 bin/reproducible_create_meta_pkg_sets.sh | 10 +++++-----
 job-cfg/reproducible.yaml                |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 28cea90..18b7841 100644
--- a/TODO
+++ b/TODO
@@ -89,6 +89,8 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 * replace with bin/setsid.py workaround with setsid from the util-linux package from jessie
 * bin/g-i-installation: use lvcreate without --virtualsize
 * check if the sudo workaround in bin/g-i-installation is still needed: 'guestmount -o uid=$(id -u) -o gid=$(id -g)' would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed.
+* install pbuilder from jessie-backports
+* install botch from jessie-backports (and remove botch from the reproducible-unstable schroot)
 
 === To be done once bugs are fixed
 
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index c52b025..90592c1 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -141,11 +141,11 @@ update_pkg_sets() {
 	# more packages are needed to build build-essential
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[4]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[4]}.pkgset ] ; then
 		grep-dctrl --exact-match --field Package build-essential "$PACKAGES" \
-			| botch-latest-version - - \
-			| botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
-			| botch-create-graph --deb-native-arch="$ARCH" --strongtype --bg "$SOURCES" "$PACKAGES" - \
-			| botch-buildgraph2packages - "$PACKAGES" \
-			| botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
+			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-latest-version - - \
+			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
+			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-create-graph --deb-native-arch="$ARCH" --strongtype --bg "$SOURCES" "$PACKAGES" - \
+			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-buildgraph2packages - "$PACKAGES" \
+			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
 			| grep-dctrl --no-field-names --show-field=Package '' \
 			| sort -u > $TMPFILE
 		update_if_similar ${META_PKGSET[4]}.pkgset
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index e043b8a..4f9d002 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -265,7 +265,7 @@
         - '{name}_setup_schroot_unstable':
             my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
             my_timed: '23 1 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-unstable unstable reproducible'
+            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-unstable unstable reproducible botch'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
         - '{name}_setup_schroot_testing':
             my_description: 'Setup testing schroot for fetching source packages for the builder jobs.'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git