summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-10-28 03:59:43 -0400
committerDan Radez <dradez@redhat.com>2016-11-01 11:06:15 -0400
commit449e8f1e1dfc9c7a678941a74bf7c59edd4ea981 (patch)
tree2c9bdb1161ffa3fb3e04c32d86483cd53264fd87
parentadbc4fede7480ffb77ff4754c0847be796a9c22a (diff)
Enabling alternalte method to get remote md5
The onos tar is an example of the remote server not supplying a .md5 file with the md5 in it. It is instead posted on an html page that can be scraped to get the value. This patch adds the ability to pass that value into the caching functions so can keep onos cached and not redownload it over and over again JIRA: APEX-325 Change-Id: I88be72d4fd6aa7245b02b9ef0f2b7e6eefff3dac Signed-off-by: Dan Radez <dradez@redhat.com>
-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/ \