diff options
| -rwxr-xr-x | build/overcloud-onos.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 72f3a681..d59be0a3 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -19,7 +19,7 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ####################################### # upgrade ovs into ovs 2.5.90 with NSH function -curl -O "$onos_artifacts_uri"package_ovs_rpm.tar.gz +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" \ @@ -31,7 +31,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload openvswitch-kmod-2.5.90-1.el7. # get the onos files rm -rf puppet-onos populate_cache "$onos_release_uri/$onos_release_file" -populate_cache "$onos_artifacts_uri/jdk-8u51-linux-x64.tar.gz" +populate_cache "$onos_jdk_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" \ diff --git a/build/variables.sh b/build/variables.sh index 19294ce5..a00c5b0d 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -11,14 +11,15 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ 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/ +onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev +onos_ovs_uri=https://www.dropbox.com/s/gm6o6k80l56pf0o dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( -'ovs4opnfv-dpdk-16.04.0-2.el7.centos.x86_64.rpm' -'ovs4opnfv-dpdk-devel-16.04.0-2.el7.centos.x86_64.rpm' -'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' +'ovs4opnfv-32930523-dpdk-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-32930523-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-32930523-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-32930523-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) |