summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-11-03 12:29:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-03 12:29:45 +0000
commit3da4fac9065a2c3c0f2f945ab857ace4a457e7cd (patch)
treebfaa285eb03e6eab6c7b4b0e20764a5450a1df43 /build
parent8b58d7ecc5b546ee3c52a8862a553bdbaeaccaf9 (diff)
parent449e8f1e1dfc9c7a678941a74bf7c59edd4ea981 (diff)
Merge "Enabling alternalte method to get remote md5"
Diffstat (limited to 'build')
-rw-r--r--build/cache.sh7
-rwxr-xr-xbuild/overcloud-onos.sh2
2 files changed, 7 insertions, 2 deletions
diff --git a/build/cache.sh b/build/cache.sh
index 4d41a7a2..5c7e5e73 100644
--- a/build/cache.sh
+++ b/build/cache.sh
@@ -38,12 +38,15 @@ function curl_file {
}
# $1 = download url
+# $2 = remote md5
function populate_cache {
local my_md5
cache_dir
# get the file name
filename="${1##*/}"
+ # copy passed in md5
+ remote_md5=$2
# check if the cache file exists
# and if it has an md5 compare that
@@ -53,7 +56,9 @@ function populate_cache {
curl_file $1 $filename
else
echo "Cache file exists...comparing MD5 checksum"
- remote_md5="$(curl -sf -L ${1}.md5 | awk {'print $1'})"
+ if [ -z $remote_md5 ]; then
+ remote_md5="$(curl -sf -L ${1}.md5 | awk {'print $1'})"
+ fi
if [ -z "$remote_md5" ]; then
echo "Got empty MD5 from remote for $filename, skipping MD5 check"
curl_file $1 $filename
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 2b3e5225..921ad506 100755
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -20,7 +20,7 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
# get the onos files
rm -rf puppet-onos
-populate_cache "$onos_release_uri/$onos_release_file"
+populate_cache "$onos_release_uri/$onos_release_file" "$(curl https://downloads.onosproject.org/nightly/ | grep $onos_release_file | grep -o -e '[0-9a-f]\{32\}')"
populate_cache "$onos_jdk_uri/jdk-8u51-linux-x64.tar.gz"
LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file:/opt/ \