X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-onos.sh;h=921ad50635d38da83a60ea33bd6524602fbb74ad;hb=af3976a683b8bdfd6a16d599940c2aa8dea3a077;hp=b695983a776bf5eb621d11f86c32ec8264a109bd;hpb=839cc3c0c4d625a163c238e0c08b5540e4e2e1ab;p=apex.git diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index b695983a..921ad506 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -18,15 +18,9 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ##### Adding ONOS to overcloud ##### ####################################### -# upgrade ovs into ovs 2.5.90 with NSH function -LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ - --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ - -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/ \