Merge "giving some love to make clean"

[apex.git] / build / overcloud-onos.sh

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 88f0b16..2b3e522 100755 (executable)
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -18,23 +18,25 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
 #####    Adding ONOS to overcloud #####
 #######################################
 
-# upload the onos puppet module
+# get the onos files
 rm -rf puppet-onos
-git clone https://github.com/bobzhouHW/puppet-onos.git
-pushd puppet-onos > /dev/null
+populate_cache "$onos_release_uri/$onos_release_file"
+populate_cache "$onos_jdk_uri/jdk-8u51-linux-x64.tar.gz"
 
-# download jdk, onos and maven dependancy packages.
-pushd files
-for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do
-    populate_cache ${onos_artifacts_uri}/$i
-    get_cached_file $i
-done
-popd > /dev/null
+LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file:/opt/ \
+                                         --run-command "mkdir /opt/onos && cd /opt/ && tar -xzf $onos_release_file -C /opt/onos --strip-components=1" \
+                                         -a overcloud-full-onos_build.qcow2
 
-popd > /dev/null
+#Those files can be store in local cache for saving download time
+git clone https://github.com/bobzhouHW/puppet-onos.git
 tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos
 
-LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-onos.tar.gz:/etc/puppet/modules/ \
-                                         --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" -a overcloud-full-onos_build.qcow2
+LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/jdk-8u51-linux-x64.tar.gz:/opt/ \
+                                         --upload puppet-onos/files/install_jdk8.tar:/opt/ \
+                                         --run-command "cd /opt/ && tar -xf install_jdk8.tar && sh /opt/install_jdk8/install_jdk8.sh" \
+                                         --upload puppet-onos.tar.gz:/etc/puppet/modules/ \
+                                         --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \
+                                         -a overcloud-full-onos_build.qcow2
+
 mv overcloud-full-onos_build.qcow2 overcloud-full-onos.qcow2
 popd > /dev/null