[Qa-jenkins-scm] [jenkins.debian.net] 02/02: Revert "Vary the lengths of the two build paths"

[Mattia Rizzolo]

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

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

commit b98d3cba8f7726de25317deb05832c583c6000c8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Aug 31 14:36:22 2016 +0000

    Revert "Vary the lengths of the two build paths"
    
    It causes a too huge diff in the binaries, making diffoscope output unreadable.
    
    This reverts commit e5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b.
---
 bin/reproducible_build.sh  | 4 ++--
 bin/reproducible_common.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 02b70b2..e7b5667 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -598,7 +598,7 @@ export LANGUAGE="en_US:en"
 EOF
 	# build path is not yet varied on testing
 	if [ "${SUITE}" != "testing" ]; then
-		echo "BUILDDIR=/build-first" >> "$TMPCFG"
+		echo "BUILDDIR=/build-1st" >> "$TMPCFG"
 	fi
 	# remember to change the sudoers setting if you change the following command
 	# FIXME: call with --buildinfo-identifier=dummy instead and below
@@ -657,7 +657,7 @@ umask 0002
 EOF
 	# build path is not yet varied on testing
 	if [ "${SUITE}" != "testing" ]; then
-		echo "BUILDDIR=/build-second" >> "$TMPCFG"
+		echo "BUILDDIR=/build-2nd" >> "$TMPCFG"
 	fi
 	set +e
 	# remember to change the sudoers setting if you change the following command
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 11f247a..2cb89f4 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -410,7 +410,7 @@ write_variation_table() {
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
-		write_page "<tr><td>build path</td><td>/build-first <em>(not varied for stretch)</em></td><td>/build-second <em>(not varied for stretch)</em></td></tr>"
+		write_page "<tr><td>build path</td><td>/build-1st <em>(not varied for stretch)</em></td><td>/build-2nd <em>(not varied for stretch)</em></td></tr>"
 		write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
 		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"
 		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX on amd64 and i386: 18 or 17<br />  XXX on armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY on amd64 and i386: 17 or 18 (!= the first build)<br />  YYY on armhf: 8, 4, or 2 (not varied systematically)</td></tr>"

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