[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: Temporarily disable "fixfilepath" dpkg-buildflag

[Vagrant Cascadian]

Vagrant Cascadian pushed to branch master at Debian QA / jenkins.debian.net


Commits:
f2a447ea by Vagrant Cascadian at 2020-06-12T14:20:55-07:00
reproducible Debian: Temporarily disable "fixfilepath" dpkg-buildflag
on bullseye.

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -578,6 +578,12 @@ first_build() {
 			*) NUM_CPU=5 ;;
 		esac
 	fi
+	# Temporarily disable fixfilepath on bullseye, to get better data about:
+	# https://tests.reproducible-builds.org/debian/issues/unstable/ftbfs_due_to_f-file-prefix-map_issue.html
+	case "${SUITE}" in
+		bullseye) reproducible_buildflags="+all,-fixfilepath" ;;
+		*) reproducible_buildflags="+all" ;;
+	esac
 	local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=1111
@@ -585,7 +591,7 @@ export BUILDUSERNAME=pbuilder1
 export BUILDUSERGECOS="first user,first room,first work-phone,first home-phone,first other"
 # pbuilder sets HOME to the value of BUILD_HOME…
 BUILD_HOME=/nonexistent/first-build
-export DEB_BUILD_OPTIONS="buildinfo=+all reproducible=+all parallel=$NUM_CPU"
+export DEB_BUILD_OPTIONS="buildinfo=+all reproducible=${reproducible_buildflags} parallel=$NUM_CPU"
 export TZ="/usr/share/zoneinfo/Etc/GMT+12"
 export LANG="C"
 unset LC_ALL
@@ -669,13 +675,19 @@ second_build() {
 			language=et
 			;;
 	esac
+	# Temporarily disable fixfilepath on bullseye, to get better data about:
+	# https://tests.reproducible-builds.org/debian/issues/unstable/ftbfs_due_to_f-file-prefix-map_issue.html
+	case "${SUITE}" in
+		bullseye) reproducible_buildflags="+all,-fixfilepath" ;;
+		*) reproducible_buildflags="+all" ;;
+	esac
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222
 export BUILDUSERNAME=pbuilder2
 export BUILDUSERGECOS="second user,second room,second work-phone,second home-phone,second other"
 # pbuilder sets HOME to the value of BUILD_HOME…
 BUILD_HOME=/nonexistent/second-build
-export DEB_BUILD_OPTIONS="buildinfo=+all reproducible=+all parallel=$NUM_CPU"
+export DEB_BUILD_OPTIONS="buildinfo=+all reproducible=${reproducible_buildflags} parallel=$NUM_CPU"
 export TZ="/usr/share/zoneinfo/Etc/GMT-14"
 export LANG="$locale.UTF-8"
 export LC_ALL="$locale.UTF-8"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f2a447eacfe375951476f369c8b61f02891d97c7
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/20200612/0346f68a/attachment-0001.html>