[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: refactor

[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 9d2b25f3ce3eb552f969f2a03bcccb5536ff71b7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 12 23:58:38 2015 +0200

    reproducible: refactor
---
 bin/reproducible_build.sh    | 2 +-
 bin/reproducible_common.sh   | 1 +
 bin/reproducible_coreboot.sh | 1 -
 bin/reproducible_freebsd.sh  | 1 -
 bin/reproducible_netbsd.sh   | 1 -
 bin/reproducible_openwrt.sh  | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index c00b6ca..02623b3 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -320,7 +320,7 @@ call_diffoscope_on_changes_files() {
 	local TIMEOUT="30m"
 	DBDSUITE=$SUITE
 	if [ "$SUITE" = "experimental" ] ; then
-		# there is no extra diffoscope-schroot for experimental because we specical case ghc enough already ;)
+		# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
 		DBDSUITE="unstable"
 	fi
 	set -x # FIXME: to debug diffopscpe/schroot problems
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 254df4a..66d6b93 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -38,6 +38,7 @@ REPRODUCIBLE_URL=https://reproducible.debian.net
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
+DBDSUITE="unstable"
 
 # suites being tested
 SUITES="testing unstable experimental"
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 0ea0b36..5bb20b5 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -152,7 +152,6 @@ rm -r $TMPBUILDDIR/coreboot
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on coreboot images."
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index 1c17402..d41bd89 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -110,7 +110,6 @@ umask 0022
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on freebsd..."
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index 9aa3586..86d6713 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -119,7 +119,6 @@ rm -r $TMPBUILDDIR/netbsd
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on netbsd..."
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 0c851be..e855d7c 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -204,7 +204,6 @@ rm -r $TMPBUILDDIR/openwrt
 # run diffoscope on the results
 # (this needs refactoring rather badly)
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on OpenWrt images and packages."

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