From: Anil Belur Date: Mon, 3 Apr 2017 06:56:08 +0000 (+1000) Subject: Revert "Reduce verbosity of wget command" X-Git-Tag: release/carbon~196 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8ada6307a1d87cb74c2fc8e45c6a8bd709ede465;p=releng%2Fbuilder.git Revert "Reduce verbosity of wget command" - wget options changed skips dist bundle download with usage causing some of the jobs to fail This reverts commit 8cb455437ca3268b6b1a8ddcf5739c966a4cb2dc. Change-Id: Ice28cde978931cd6b19b1629b5f310edc0c864d7 Signed-off-by: Anil Belur --- diff --git a/jjb/integration/include-raw-integration-compare-distributions.sh b/jjb/integration/include-raw-integration-compare-distributions.sh index 0c28ae3e5..ae172ad36 100644 --- a/jjb/integration/include-raw-integration-compare-distributions.sh +++ b/jjb/integration/include-raw-integration-compare-distributions.sh @@ -5,7 +5,7 @@ # Do not fail the build if there is trouble trying to collect distribution patch diffs set +e -wget --non-verbose --show-progress --progress=dot:giga $ACTUALBUNDLEURL +wget --progress=dot:mega $ACTUALBUNDLEURL echo "Extracting the last distribution found on nexus..." unzip -q $BUNDLE mv $BUNDLEFOLDER /tmp/distro_old diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh index bf32c0452..bad2f7583 100644 --- a/jjb/integration/include-raw-integration-configure-clustering.sh +++ b/jjb/integration/include-raw-integration-configure-clustering.sh @@ -64,7 +64,7 @@ echo "Changing to /tmp" cd /tmp echo "Downloading the distribution from ${ACTUALBUNDLEURL}" -wget --non-verbose --show-progress --progress=dot:giga '${ACTUALBUNDLEURL}' +wget --progress=dot:mega '${ACTUALBUNDLEURL}' echo "Extracting the new controller..." unzip -q ${BUNDLE} diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh index 657762178..bc525171f 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh @@ -8,7 +8,7 @@ echo "Clean workspace" rm -rf * echo "Downloading the distribution..." -wget --non-verbose --show-progress --progress=dot:giga ${ACTUALBUNDLEURL} +wget --progress=dot:mega ${ACTUALBUNDLEURL} echo "Extracting the new controller..." unzip -q ${BUNDLE} diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh index 6a954eebf..5dd16bb0d 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh @@ -43,7 +43,7 @@ echo "Changing to /tmp" cd /tmp echo "Downloading the distribution..." -wget --non-verbose --show-progress --progress=dot:giga '${ACTUALBUNDLEURL}' +wget --progress=dot:mega '${ACTUALBUNDLEURL}' echo "Extracting the new controller..." unzip -q ${BUNDLE} diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh index a4df3d7ae..bd74574da 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh @@ -8,7 +8,7 @@ echo "Clean workspace" rm -rf * echo "Downloading the distribution..." -wget --non-verbose --show-progress --progress=dot:giga ${ACTUALBUNDLEURL} +wget --progress=dot:mega ${ACTUALBUNDLEURL} echo "Extracting the new controller..." unzip -q ${BUNDLE}