[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: create debbindiff-schroot for testing too, as ghc differs too much to unstable now

[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 c51851b134748341641911505e214843a92e1322
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 2 14:19:05 2015 +0200

    reproducible: create debbindiff-schroot for testing too, as ghc differs too much to unstable now
---
 bin/reproducible_build.sh | 9 +++++++--
 job-cfg/reproducible.yaml | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8d7dab1..0673760 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -248,13 +248,18 @@ call_debbindiff() {
 	local TMPLOG=(mktemp --tmpdir=$TMPDIR)
 	echo | tee -a ${RBUILDLOG}
 	local TIMEOUT="30m"  # don't forget to also change the "seq 0 200" loop 33 lines above
-	DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --version 2>&1)"
+	DBDSUITE=$SUITE
+	if [ "$SUITE" = "experimental" ] ; then
+		# there is no extra debbindiff-schroot for experimental because we specical case ghc enough already ;)
+		DBDSUITE="unstable"
+	fi
+	DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 	echo "$(date) - $DBDVERSION will be used to compare the two builds now." | tee -a ${RBUILDLOG}
 	set +e
 	set -x
 	( timeout $TIMEOUT schroot \
 		--directory $TMPDIR \
-		-c source:jenkins-reproducible-unstable-debbindiff \
+		-c source:jenkins-reproducible-${DBDSUITE}-debbindiff \
 		debbindiff -- \
 			--html ./${DBDREPORT} \
 			./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index fc8e0b7..b01869a 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -142,6 +142,10 @@
 
 - job-template:
     defaults: reproducible
+    name: '{name}_setup_schroot_testing_debbindiff'
+
+- job-template:
+    defaults: reproducible
     name: '{name}_setup_schroot_unstable'
 
 - job-template:
@@ -253,6 +257,11 @@
             my_timed: '23 0 * * *'
             my_shell: '/srv/jenkins/bin/reproducible_setup_schroot.sh reproducible-unstable-debbindiff unstable debbindiff locales-all'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
+        - '{name}_setup_schroot_testing_debbindiff':
+            my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)'
+            my_timed: '23 0 * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_setup_schroot.sh reproducible-testing-debbindiff testing debbindiff locales-all'
+            my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
         - '{name}_setup_schroot_unstable':
             my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
             my_timed: '23 1 * * *'

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