diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-30 15:33:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-30 15:33:03 +0000 |
| commit | 398b356523bda62fab449fd2d79ef689e46c604b (patch) | |
| tree | f990484c03bdc42875ac07ac766e9d68dc94b3ca | |
| parent | 1e1d187d9c64229ddfb97925bb1b46a1754e6cd1 (diff) | |
| parent | eec0698cc6b743b53df8a10d07ddfb366dce8232 (diff) | |
Merge "[APEX-171] Upgrade ONOS into 1.6 and ovs into 2.5.90 for SFC function"
| -rwxr-xr-x | build/overcloud-onos.sh | 25 | ||||
| -rw-r--r-- | build/variables.sh | 8 |
2 files changed, 26 insertions, 7 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 7922a54a..72f3a681 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -18,17 +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 -O "$onos_artifacts_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 -git clone https://github.com/bobzhouHW/puppet-onos.git populate_cache "$onos_release_uri/$onos_release_file" +populate_cache "$onos_artifacts_uri/jdk-8u51-linux-x64.tar.gz" + +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 diff --git a/build/variables.sh b/build/variables.sh index 8397dfd8..19294ce5 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -9,8 +9,10 @@ ############################################################################## rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ -onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/ -onos_release_file=onos-1.5.0.tar.gz +onos_release_uri=https://downloads.onosproject.org/nightly/ +onos_release_file=onos-1.6.0-rc2.tar.gz +onos_artifacts_uri=http://205.177.226.237:9999/onosfw/ + dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( @@ -19,4 +21,4 @@ dpdk_rpms=( 'ovs4opnfv-dpdk-examples-16.04.0-2.el7.centos.x86_64.rpm' 'ovs4opnfv-dpdk-tools-16.04.0-2.el7.centos.x86_64.rpm' 'ovs4opnfv-openvswitch-2.5.90-0.12060.git46ed1382.1.el7.centos.x86_64.rpm' -)
\ No newline at end of file +) |