Skip to content

Commit 8c413e1

Browse files
committed
Change wget verboseness.
Significantly decreases verbosity of script, especially now that we're running in jenkins.
1 parent 2208320 commit 8c413e1

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

scripts/build-probe-binaries

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
#
2525
set -euo pipefail
2626

27-
#
28-
# For continuous integration log purposes, wget prints its own output to stderr
29-
# so it can be convenient to redirect it to a file. This can be done directly
30-
# at runtime.
31-
#
32-
3327
PROBE_NAME=$1
3428
PROBE_VERSION=$2
3529
REPOSITORY_NAME=$3
@@ -156,7 +150,7 @@ function coreos_build_old {
156150
cd $COREOS_DIR
157151

158152
if [ ! -f config_orig ]; then
159-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
153+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
160154
bunzip2 coreos_developer_container.bin.bz2
161155
sudo kpartx -asv coreos_developer_container.bin
162156
LOOPDEV=$(sudo kpartx -asv coreos_developer_container.bin | cut -d\ -f 3)
@@ -178,7 +172,7 @@ function coreos_build_old {
178172
KERNEL_URL=https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/$TGZ_NAME
179173

180174
if [ ! -f $TGZ_NAME ]; then
181-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
175+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
182176
fi
183177

184178
if [ ! -d $DIR_NAME ]; then
@@ -215,7 +209,7 @@ function coreos_build_new {
215209
cd $COREOS_DIR
216210

217211
if [ ! -f coreos_developer_container.bin ]; then
218-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
212+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
219213
bunzip2 coreos_developer_container.bin.bz2
220214
fi
221215

@@ -277,7 +271,7 @@ function boot2docker_build {
277271

278272
if [ ! -f $TGZ_NAME ]; then
279273
echo Downloading $TGZ_NAME [Boot2Docker]
280-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
274+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
281275
fi
282276

283277
if [ ! -d $DIR_NAME ]; then
@@ -300,7 +294,7 @@ function boot2docker_build {
300294
; do \
301295
patch -p1 < "$patch"; \
302296
done
303-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} -O .config $KERNEL_CONFIG
297+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} -O .config $KERNEL_CONFIG
304298
cp .config ../config-orig
305299
make olddefconfig
306300
make modules_prepare
@@ -340,7 +334,7 @@ function ubuntu_build {
340334

341335
if [ ! -f $DEB ]; then
342336
echo Downloading $DEB [Ubuntu]
343-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
337+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
344338
dpkg -x $DEB ./
345339
fi
346340

@@ -384,7 +378,7 @@ function rhel_build {
384378

385379
if [ ! -f $RPM ]; then
386380
echo Downloading $RPM [RHEL and CentOS]
387-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
381+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
388382
rpm2cpio $RPM | cpio -idm
389383
fi
390384

@@ -424,7 +418,7 @@ function debian_build {
424418
fi
425419
if [ ! -f ${BASEDIR}/common-dependencies/debian/kbuild/${DEB} ]; then
426420
echo Downloading ${DEB} [Debian]
427-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} -P ${BASEDIR}/common-dependencies/debian/kbuild ${URL}
421+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} -P ${BASEDIR}/common-dependencies/debian/kbuild ${URL}
428422
fi
429423
return
430424
else
@@ -446,7 +440,7 @@ function debian_build {
446440

447441
if [ ! -f ${DEB} ]; then
448442
echo Downloading ${DEB} [Debian]
449-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${URL}
443+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${URL}
450444
dpkg -x ${DEB} ./
451445
fi
452446
fi
@@ -504,7 +498,7 @@ function minikube_build {
504498
MINIKUBE_DIR=${MINIKUBE_BASEDIR}/minikube-$(echo ${VERSION} | sed 's/^v//')
505499

506500
if [ ! -d ${MINIKUBE_DIR} ]; then
507-
wget -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://github.com/kubernetes/minikube/archive/${VERSION}.tar.gz
501+
wget -nv -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://github.com/kubernetes/minikube/archive/${VERSION}.tar.gz
508502
tar -C ${MINIKUBE_BASEDIR} -zxf ${MINIKUBE_BASEDIR}/${VERSION}.tar.gz
509503
rm -f ${MINIKUBE_BASEDIR}/${VERSION}.tar.gz
510504
fi
@@ -529,7 +523,7 @@ function minikube_build {
529523
export KERNELDIR=${MINIKUBE_BASEDIR}/linux-${MINIKUBE_KERNEL_VERSION}
530524

531525
if [ ! -d ${KERNELDIR} ]; then
532-
wget -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/${TGZ_NAME}
526+
wget -nv -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/${TGZ_NAME}
533527
tar -C ${MINIKUBE_BASEDIR} -xf ${MINIKUBE_BASEDIR}/${TGZ_NAME}
534528
rm -f ${MINIKUBE_BASEDIR}/${TGZ_NAME}
535529
fi

0 commit comments

Comments
 (0)