X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-onos.sh;h=4b8b13508685fbb562a249ebfb853c7ce8472e43;hb=2e9b552d5efe383ce08ff48a9739031f28251013;hp=070365d745f060ef21ad649cffa0d0f5aa7a1860;hpb=5f6676a3e408e45aed62947b35106a40a5a93626;p=apex.git

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 070365d7..4b8b1350 100755
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -18,21 +18,34 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
 #####    Adding ONOS to overcloud #####
 #######################################
 
+# upgrade ovs into ovs 2.5.90 with NSH function
+curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz
+tar -xzf package_ovs_rpm2.tar.gz
+LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \
+                                         --run-command "yum install -y /root/${ovs_kmod_rpm_name}" \
+                                         --upload ${ovs_rpm_name}:/root/ \
+                                         --run-command "yum upgrade -y /root/${ovs_rpm_name}" \
+                                         -a overcloud-full-onos_build.qcow2
+
+
 # get the onos files
 rm -rf puppet-onos
-git clone https://github.com/bobzhouHW/puppet-onos.git
 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.
-#for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do
+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
 
+#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 --install "java-1.8.0-openjdk" \
+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" \
-                                         --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