[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: use botch from stretch

[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 95a782fa567aef1c4dd9943b2d4fd9af94d9c1d7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Sep 23 12:03:42 2017 +0200

    reproducible Debian: use botch from stretch
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 TODO                                     |  5 -----
 bin/reproducible_create_meta_pkg_sets.sh | 10 +++++-----
 job-cfg/reproducible.yaml                |  2 +-
 update_jdn.sh                            |  3 ++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index 60295a8..29ec82e 100644
--- a/TODO
+++ b/TODO
@@ -64,11 +64,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * make live-build jobs work again or remove them
 * make sure the live-build jobs clean up /srv/live-build/results/*iso once they are done. thats 8gb wasted.
 
-=== To be done once jenkins.d.n runs stretch
-
-* install botch from stretch and remove botch from the reproducible-unstable schroot
-** botch now depends on a newer dose3, which depends on the ocaml from stretch. ocaml cannot be sensibly backported, so thats why this will have to wait for stretch
-
 ==== proper backup
 
 * postponed til we run on .debian.org
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 0cc210e..2643789 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -197,11 +197,11 @@ update_pkg_set_specific() {
 			# Since this is only the strong set, it is a minimal set. In reality
 			# more packages are needed to build build-essential
 			grep-dctrl --exact-match --field Package build-essential "$PACKAGES" \
-				| 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-drop-b-d-indep --quiet --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" \
+				| botch-latest-version - - \
+				| botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
+				| botch-create-graph --deb-drop-b-d-indep --quiet --deb-native-arch="$ARCH" --strongtype --bg "$SOURCES" "$PACKAGES" - \
+				| botch-buildgraph2packages - "$PACKAGES" \
+				| botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
 				| grep-dctrl --no-field-names --show-field=Package '' > $TMPFILE
 			;;
 		popcon_top1337-installed-sources)
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 2f9076a..c1ea091 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -478,7 +478,7 @@
                     my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-buster-diffoscope buster diffoscope locales-all'
                 - 'unstable':
                     my_timed: '42 1 * * *'
-                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro} botch'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}'
                 - 'stretch':
                     my_timed: '42 1 * * *'
                 - 'buster':
diff --git a/update_jdn.sh b/update_jdn.sh
index 120bff1..b73f0bc 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -434,7 +434,8 @@ if [ -f /etc/debian_version ] ; then
 				apt-listchanges 
 				asciidoc
 				binfmt-support 
-				bison 
+				bison
+				botch
 				build-essential 
 				calamaris 
 				cmake 

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