[Qa-jenkins-scm] [jenkins.debian.net] 05/05: reproducible: setup_pbuilder: only set Acquire::Check-Valid-Until:false when the host runs in the future

[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 a8ee5a00475513044c7d88f7b11e363b63e09ea8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Apr 5 21:23:57 2018 +0200

    reproducible: setup_pbuilder: only set Acquire::Check-Valid-Until:false when the host runs in the future
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_setup_pbuilder.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 08a3a2e..2b22c53 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# vim: set noexpandtab:
 
 # Copyright 2014-2017 Holger Levsen <holger at layer-acht.org>
+#           ©    2018 Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv=2
 
 DEBUG=false
@@ -28,9 +30,6 @@ create_customized_tmpfile() {
 # this script is run within the pbuilder environment to further customize initially
 #
 echo
-echo "Configuring APT to ignore the Release file expiration"
-echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/398future
-echo
 echo "Preseeding man-db/auto-update to false"
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
 echo
@@ -38,6 +37,16 @@ echo "Configuring dpkg to not fsync()"
 echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02speedup
 echo
 EOF
+	. /srv/jenkins/bin/jenkins_node_definitions.sh
+	get_node_ssh_port "$HOSTNAME"
+	if "$NODE_RUN_IN_THE_FUTURE" ; then
+		cat >> $TMPFILE <<- EOF
+			echo "Configuring APT to ignore the Release file expiration"
+			echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/398future
+			echo
+		EOF
+	fi
+
 }
 
 create_setup_our_repo_tmpfile() {

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