Skip to content

Commit bba9660

Browse files
authored
Merge pull request #69 from infosiftr/slow-v6
Add timeout to wget
2 parents 769fcca + 87ad128 commit bba9660

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
# not doing "uses: docker-library/bashbrew@xxx" because it'll build which is slow and we don't need more than just bashbrew here
2626
mkdir .bin
27-
wget -O .bin/bashbrew 'https://github.com/docker-library/bashbrew/releases/download/v0.1.11/bashbrew-amd64'
27+
wget --timeout=5 -O .bin/bashbrew 'https://github.com/docker-library/bashbrew/releases/download/v0.1.11/bashbrew-amd64'
2828
echo '6203635644d0efef2886f8ea9c487995a7abc4166db7a4773e94f89c943a4b04 *.bin/bashbrew' | sha256sum --strict --check -
2929
chmod +x .bin/bashbrew
3030
.bin/bashbrew --version

Jenkinsfile.build

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ node('multiarch-' + env.BASHBREW_ARCH) { ansiColor('xterm') {
4545
fi
4646

4747
# https://doi-janky.infosiftr.net/job/wip/job/crane
48-
wget -O "crane$ext" "https://doi-janky.infosiftr.net/job/wip/job/crane/lastSuccessfulBuild/artifact/crane-$BASHBREW_ARCH$ext" --progress=dot:giga
48+
# ipv6 can be extremely slow on s390x so set a timeout and have wget try the other DNS addresses instead
49+
wget --timeout=5 -O "crane$ext" "https://doi-janky.infosiftr.net/job/wip/job/crane/lastSuccessfulBuild/artifact/crane-$BASHBREW_ARCH$ext" --progress=dot:giga
4950
# TODO checksum verification ("checksums.txt")
5051
chmod +x "crane$ext"
5152
"./crane$ext" version

Jenkinsfile.trigger

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ node {
3939
pastFailedJobsJson = sh(returnStdout: true, script: '''#!/usr/bin/env bash
4040
set -Eeuo pipefail -x
4141

42-
if ! json="$(wget -qO- "$JOB_URL/lastSuccessfulBuild/artifact/pastFailedJobs.json")"; then
42+
if ! json="$(wget --timeout=5 -qO- "$JOB_URL/lastSuccessfulBuild/artifact/pastFailedJobs.json")"; then
4343
echo >&2 'failed to get pastFailedJobs.json'
4444
json='{}'
4545
fi

0 commit comments

Comments
 (0)