diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/cache.sh | 15 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 10 | ||||
| -rwxr-xr-x | build/overcloud-onos.sh | 4 |
3 files changed, 22 insertions, 7 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/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 6067c7e0..327df3bc 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -48,7 +48,15 @@ install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/python/apex-python-utils.py %{buildroot}%{_var}/opt/opnfv/lib/python/ mkdir -p %{buildroot}%{python3_sitelib}/apex/ -install lib/python/apex/ %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/deploy_env.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/network_environment.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/network_settings.py %{buildroot}%{python3_sitelib}/apex/ +mkdir -p %{buildroot}%{python3_sitelib}/apex/common +install lib/python/apex/common/__init__.py %{buildroot}%{python3_sitelib}/apex/common/ +install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/common/ +install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ 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" \ |