[Qa-jenkins-scm] [jenkins.debian.net] 04/05: reproducible: use wget --timeout instead of /usr/bin/timeout (as downloads actually might take some time…)

Holger Levsen holger at moszumanska.debian.org
Sat Sep 26 09:03:01 UTC 2015


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 49e5633927fd3d05a3063a0faf26272c6c71c8e5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Sep 26 10:42:22 2015 +0200

    reproducible: use wget --timeout instead of /usr/bin/timeout (as downloads actually might take some time…)
---
 bin/reproducible_build.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8052aaf..a212b93 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -459,8 +459,7 @@ get_source_package() {
 		RESULT=$?
 	else
 		# the build master only needs to the the .dsc file
-		# timeout wget after 3min
-		schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs timeout -k 3m 3m wget
+		schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs -r wget --timeout=180 --tries=3
 		RESULT=$?
 	fi
 	PARSED_RESULT=$(egrep 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway)' ${RBUILDLOG} || true)
@@ -476,7 +475,7 @@ get_source_package() {
 			RESULT=$?
 		else
 			# the build master only needs to the the .dsc file
-			schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs timeout -k 3m 3m wget
+			schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs -r wget --timeout=180 --tries=3
 			RESULT=$?
 		fi
 	        PARSED_RESULT=$(egrep 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway)' ${RBUILDLOG} || true)

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



More information about the Qa-jenkins-scm mailing list