diff options
author | Dan Radez <dradez@redhat.com> | 2016-03-08 16:19:04 -0500 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2016-04-01 19:12:25 -0400 |
commit | 9a96f371f290fdf8530239a4c0df591527fe636f (patch) | |
tree | 7450d1b1e6023adf1cc82de5b3523518ce421590 /build/cache.sh | |
parent | 53003f9fef6b49304f37e5fbb5d15bc4f1316948 (diff) |
Migrating to Mitaka
- Only support for NOSDN for this patch
- Other SDN controllers will not be tested for this patch
- AODH is now upstream and not needed to be carried in Apex
- puppet-cinder-quota-fix.patch is now upstream and not needed to be carried in Apex
- puppet-neutron-force-metadata.patch is now upstream and not needed to be carried in Apex
- removing the catalog of nic files and creating a templatization for them
JIRA: APEX-108
JIRA: APEX-93
JIRA: APEX-92
Change-Id: Ic1a24baec7ef295e9dc1b8b72ac36ca5b05578ea
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/cache.sh')
-rw-r--r-- | build/cache.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/cache.sh b/build/cache.sh index b8cd8ecc..72d0a87f 100644 --- a/build/cache.sh +++ b/build/cache.sh @@ -25,8 +25,10 @@ function cache_git_tar { # $2 = filename to write to function curl_file { echo "Downloading $1" - echo "Cache location: $CACHE_DIR/$2" - curl -L $1 > $CACHE_DIR/$2 + echo "Cache download location: $CACHE_DIR/$2" + until curl -C- -L -o $CACHE_DIR/$2 $1 || (( count++ >= 20 )); do + echo -n '' #do nothing, we just want to loop + done sed -i "/$2/d" $CACHE_DIR/.cache echo "$(md5sum $CACHE_DIR/$2) $2" >> $CACHE_DIR/.cache } @@ -44,7 +46,7 @@ function populate_cache { if [ ! -f $CACHE_DIR/${filename} ]; then curl_file $1 $filename else - remote_md5="$(curl -L ${1}.md5 | awk {'print $1'})" + remote_md5="$(curl -sf -L ${1}.md5 | awk {'print $1'})" if [ -z "$remote_md5" ]; then echo "Got empty MD5 from remote for $filename, skipping MD5 check" elif [ "$remote_md5" != "$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'})" ]; then |