Skip to content

Commit fedaee7

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

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
@@ -140,7 +134,7 @@ function coreos_build_old {
140134
cd $COREOS_DIR
141135

142136
if [ ! -f config_orig ]; then
143-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
137+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
144138
bunzip2 coreos_developer_container.bin.bz2
145139
sudo kpartx -asv coreos_developer_container.bin
146140
LOOPDEV=$(sudo kpartx -asv coreos_developer_container.bin | cut -d\ -f 3)
@@ -162,7 +156,7 @@ function coreos_build_old {
162156
KERNEL_URL=https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/$TGZ_NAME
163157

164158
if [ ! -f $TGZ_NAME ]; then
165-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
159+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
166160
fi
167161

168162
if [ ! -d $DIR_NAME ]; then
@@ -197,7 +191,7 @@ function coreos_build_new {
197191
cd $COREOS_DIR
198192

199193
if [ ! -f coreos_developer_container.bin ]; then
200-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
194+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${VERSION_URL}coreos_developer_container.bin.bz2
201195
bunzip2 coreos_developer_container.bin.bz2
202196
fi
203197

@@ -257,7 +251,7 @@ function boot2docker_build {
257251

258252
if [ ! -f $TGZ_NAME ]; then
259253
echo Downloading $TGZ_NAME [Boot2Docker]
260-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
254+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $KERNEL_URL
261255
fi
262256

263257
if [ ! -d $DIR_NAME ]; then
@@ -280,7 +274,7 @@ function boot2docker_build {
280274
; do \
281275
patch -p1 < "$patch"; \
282276
done
283-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} -O .config $KERNEL_CONFIG
277+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} -O .config $KERNEL_CONFIG
284278
cp .config ../config-orig
285279
make olddefconfig
286280
make modules_prepare
@@ -319,7 +313,7 @@ function ubuntu_build {
319313

320314
if [ ! -f $DEB ]; then
321315
echo Downloading $DEB [Ubuntu]
322-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
316+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
323317
dpkg -x $DEB ./
324318
fi
325319

@@ -361,7 +355,7 @@ function rhel_build {
361355

362356
if [ ! -f $RPM ]; then
363357
echo Downloading $RPM [RHEL and CentOS]
364-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
358+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} $URL
365359
rpm2cpio $RPM | cpio -idm
366360
fi
367361

@@ -399,7 +393,7 @@ function debian_build {
399393
fi
400394
if [ ! -f ${BASEDIR}/common-dependencies/debian/kbuild/${DEB} ]; then
401395
echo Downloading ${DEB} [Debian]
402-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} -P ${BASEDIR}/common-dependencies/debian/kbuild ${URL}
396+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} -P ${BASEDIR}/common-dependencies/debian/kbuild ${URL}
403397
fi
404398
return
405399
else
@@ -421,7 +415,7 @@ function debian_build {
421415

422416
if [ ! -f ${DEB} ]; then
423417
echo Downloading ${DEB} [Debian]
424-
wget --timeout=${URL_TIMEOUT} --tries=${RETRY} ${URL}
418+
wget -nv --timeout=${URL_TIMEOUT} --tries=${RETRY} ${URL}
425419
dpkg -x ${DEB} ./
426420
fi
427421
fi
@@ -478,7 +472,7 @@ function minikube_build {
478472
MINIKUBE_DIR=${MINIKUBE_BASEDIR}/minikube-$(echo ${VERSION} | sed 's/^v//')
479473

480474
if [ ! -d ${MINIKUBE_DIR} ]; then
481-
wget -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://github.com/kubernetes/minikube/archive/${VERSION}.tar.gz
475+
wget -nv -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://github.com/kubernetes/minikube/archive/${VERSION}.tar.gz
482476
tar -C ${MINIKUBE_BASEDIR} -zxf ${MINIKUBE_BASEDIR}/${VERSION}.tar.gz
483477
rm -f ${MINIKUBE_BASEDIR}/${VERSION}.tar.gz
484478
fi
@@ -503,7 +497,7 @@ function minikube_build {
503497
export KERNELDIR=${MINIKUBE_BASEDIR}/linux-${MINIKUBE_KERNEL_VERSION}
504498

505499
if [ ! -d ${KERNELDIR} ]; then
506-
wget -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/${TGZ_NAME}
500+
wget -nv -P ${MINIKUBE_BASEDIR} --timeout=${URL_TIMEOUT} --tries=${RETRY} https://www.kernel.org/pub/linux/kernel/v${MAJOR}.x/${TGZ_NAME}
507501
tar -C ${MINIKUBE_BASEDIR} -xf ${MINIKUBE_BASEDIR}/${TGZ_NAME}
508502
rm -f ${MINIKUBE_BASEDIR}/${TGZ_NAME}
509503
fi

0 commit comments

Comments
 (0)