summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-26 10:42:22 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-26 10:42:22 +0200
commit49e5633927fd3d05a3063a0faf26272c6c71c8e5 (patch)
tree976ed48c0bf0fe5a938a751f4e1fe12ea33d204c
parent86157e4deb562e790f8924f83936d0646b7cc7c5 (diff)
downloadjenkins.debian.net-49e5633927fd3d05a3063a0faf26272c6c71c8e5.tar.xz
reproducible: use wget --timeout instead of /usr/bin/timeout (as downloads actually might take some time…)
-rwxr-xr-xbin/reproducible_build.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8052aaff..a212b93f 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)