summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-04-22 01:16:27 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-22 01:16:27 +0000
commitd87cbc2f2aa88b9ba41dc34ca7098b9041fadd88 (patch)
tree0129461e99cd778b21691e59f990ef9552bf067b
parent3d56d3211e2ddee0825e79174cfdfbcda70cd20b (diff)
parent5f6676a3e408e45aed62947b35106a40a5a93626 (diff)
Merge "updating ONOS build"
-rwxr-xr-xbuild/overcloud-onos.sh21
-rw-r--r--build/variables.sh7
2 files changed, 12 insertions, 16 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 88f0b166..070365d7 100755
--- 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 5a0de36c..9bb40a9c 100644
--- 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