updating ONOS build

- the ONOS build required the stable-images dir
- also removing other stable-images references

Change-Id: Ib51e4278ac80d7900064469f6d3c3a3532296270
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 88f0b16..070365d 100755 (executable)
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -18,23 +18,22 @@ 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"
 
 # 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
+#for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do
 
-popd > /dev/null
 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 --install "java-1.8.0-openjdk" \
+                                         --upload puppet-onos.tar.gz:/etc/puppet/modules/ \
+                                         --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \
+                                         --upload $CACHE_DIR/$onos_release_file:/opt \
+                                         --run-command "cd /opt && tar xzf $onos_release_file" \
+                                         -a overcloud-full-onos_build.qcow2
+
 mv overcloud-full-onos_build.qcow2 overcloud-full-onos.qcow2
 popd > /dev/null

diff --git a/build/variables.sh b/build/variables.sh
index 5a0de36..9bb40a9 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -8,9 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-rdo_images_cache=/stable-images
 rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/
-#rdo_images_uri=file://$rdo_images_cache
-#onos_artifacts_uri=http://205.177.226.237:9999/onosfw
-onos_artifacts_uri=file:///stable-images/onos/
-odl_artifacts_cache=/stable-images/odl
+onos_release_uri=http://downloads.onosproject.org/release
+onos_release_file=onos-1.5.0.tar.gz