summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-05 03:28:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-05 03:28:51 +0000
commitef5aadab9e33e2154789a41bf9dbb8a49b086c21 (patch)
treef8b7549cc0c4c8ec89cb004610fc25e1ffba9364 /build
parentc3b974355123fe6e5cb2d4cb44215c4de3abd108 (diff)
parent3c11e9669b5559bc9b95192abf97b9613b5854d1 (diff)
Merge "Fixes build caching"
Diffstat (limited to 'build')
-rw-r--r--build/cache.sh15
-rwxr-xr-xbuild/overcloud-onos.sh4
2 files changed, 13 insertions, 6 deletions
diff --git a/build/cache.sh b/build/cache.sh
index 72d0a87f..a88ffce1 100644
--- a/build/cache.sh
+++ b/build/cache.sh
@@ -35,6 +35,7 @@ function curl_file {
# $1 = download url
function populate_cache {
+ local my_md5
cache_dir
# get the file name
@@ -42,15 +43,25 @@ function populate_cache {
# check if the cache file exists
# and if it has an md5 compare that
- echo "Checking cache file: $1"
+ echo "Checking cache file exists: ${filename}"
if [ ! -f $CACHE_DIR/${filename} ]; then
+ echo "Cache file: ${CACHE_DIR}/${filename} missing...will download..."
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
echo "Got empty MD5 from remote for $filename, skipping MD5 check"
- elif [ "$remote_md5" != "$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'})" ]; then
curl_file $1 $filename
+ else
+ my_md5=$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'})
+ if [ "$remote_md5" != "$my_md5" ]; then
+ echo "MD5 mismatch: Remote MD5 is ${remote_md5}, Cache file MD5 is ${my_md5}"
+ echo "Downloading $filename"
+ curl_file $1 $filename
+ else
+ echo "Will use cache for ${filename}"
+ fi
fi
fi
}
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 070365d7..7922a54a 100755
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -22,10 +22,6 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
rm -rf puppet-onos
git clone https://github.com/bobzhouHW/puppet-onos.git
populate_cache "$onos_release_uri/$onos_release_file"
-
-# download jdk, onos and maven dependancy packages.
-#for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do
-
tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos
LIBGUESTFS_BACKEND=direct virt-customize --install "java-1.8.0-openjdk" \