X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-onos.sh;h=c64c19b3001586591e05775675b913f195427aa3;hb=efebeeccabce03946cb5e58ee6a4eac93ec015cd;hp=d59be0a33268a5068ce940af2dbe248b37735f30;hpb=908ec812c1305a59d2009cb6d3dac4c4afa6199d;p=apex.git

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index d59be0a3..c64c19b3 100755
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -11,29 +11,19 @@ set -e
 source ./cache.sh
 source ./variables.sh
 
-pushd images > /dev/null
+pushd ${BUILD_DIR} > /dev/null
 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_rpm.tar.gz
-tar -xzf package_ovs_rpm.tar.gz
-LIBGUESTFS_BACKEND=direct virt-customize --upload openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm:/root/ \
-                                         --run-command "yum install -y /root/openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm" \
-                                         --upload openvswitch-2.5.90-1.el7.centos.x86_64.rpm:/root/ \
-                                         --run-command "yum upgrade -y /root/openvswitch-2.5.90-1.el7.centos.x86_64.rpm" \
-                                         -a overcloud-full-onos_build.qcow2
-
-
 # get the onos files
 rm -rf puppet-onos
-populate_cache "$onos_release_uri/$onos_release_file"
+populate_cache "$onos_release_uri/$onos_release_file" "$(curl https://downloads.onosproject.org/nightly/ | grep $onos_release_file | grep -o -e '[0-9a-f]\{32\}')"
 populate_cache "$onos_jdk_uri/jdk-8u51-linux-x64.tar.gz"
 
-LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file:/opt/ \
+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
 
@@ -41,10 +31,14 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file:
 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 $CACHE_DIR/jdk-8u51-linux-x64.tar.gz:/opt/ \
-                                         --upload puppet-onos/files/install_jdk8.tar:/opt/ \
+LIBGUESTFS_BACKEND=direct virt-customize --upload ${CACHE_DIR}/jdk-8u51-linux-x64.tar.gz:/opt/ \
+                                         --upload ${BUILD_DIR}/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/ \
+                                         --upload ${BUILD_DIR}/puppet-onos/files/networking-onos.tar:/opt/ \
+                                         --run-command "cd /opt/ && tar -xf networking-onos.tar && sh /opt/networking-onos/install_driver.sh" \
+                                         --upload ${BUILD_DIR}/puppet-onos/files/networking-sfc.tar:/opt/ \
+                                         --run-command "cd /opt/ && tar -xf networking-sfc.tar && sh /opt/networking-sfc/install_driver.sh" \
+                                         --upload ${BUILD_DIR}/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