[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] archlinux: fix setting LANG/LC_ALL first build

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
a0927060 by Jelle van der Waa at 2018-11-27T21:40:24Z
archlinux: fix setting LANG/LC_ALL first build

Fix setting LANG/LC_ALL in the first build by setting it in for the
schroot instead of global. Also update the variaton table.

Signed-off-by: Jelle van der Waa <jelle at archlinux.org>

- - - - -


2 changed files:

- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -141,11 +141,12 @@ first_build() {
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" | tee -a $LOG
 	# $SRCPACKAGE is actually the binary package
 	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
-	# modify timezone in the 1st build
-	echo 'export TZ="/usr/share/zoneinfo/Etc/GMT+12"' | schroot --run-session -c $SESSION --directory /tmp -- tee -a /var/lib/jenkins/.bashrc
-	# set LANG, LC_ALL to the same value as devtools.
+	# modify timezone, LANG, LC_ALL in the 1st build.
+	schroot --run-session -c $SESSION --directory /tmp -- tee -a /var/lib/jenkins/.bashrc <<-__END__
+	export TZ="/usr/share/zoneinfo/Etc/GMT+12"
 	export LANG="en_US.UTF-8"
 	export LC_ALL="en_US.UTF-8"
+	__END__
 	# some more output for debugging
 	set -x
 	# remove possible lock in our local session (happens when root maintenance update running while session starts)


=====================================
bin/reproducible_common.sh
=====================================
@@ -450,8 +450,8 @@ write_variation_table() {
 		write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>on amd64: LANGUAGE=\"fr_CH:fr\"<br />on i386: LANGUAGE=\"de_CH:de\"<br />on arm64: LANGUAGE=\"nl_BE:nl\"<br />on armhf: LANGUAGE=\"it_CH:it\"</td></tr>"
 		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>on amd64: LC_ALL=\"fr_CH.UTF-8\"<br />on i386: LC_ALL=\"de_CH.UTF-8\"<br />on arm64: LC_ALL=\"nl_BE.UTF-8\"<br />on armhf: LC_ALL=\"it_CH.UTF-8\"</td></tr>"
 	elif [ "$1" = "Arch Linux" ]  ; then
-		write_page "<tr><td>env LANG</td><td><em>not set</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
-		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LANG</td><td><em>en_US.UTF-8</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LC_ALL</td><td><em>en_US.UTF-8</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
 		write_page "<tr><td>the build path</td><td colspan=\"2\">is not yet varied between rebuilds of Arch Linux</td></tr>"
 	else
 		write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a0927060d758812993fa34937e594b4175838e61

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a0927060d758812993fa34937e594b4175838e61
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181127/9761149a/attachment-0001.html>