X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=BUILD.sh;h=4eb05776a8663723048a625c543a26ca1d6a20df;hb=8bff092ceca2155d19eb5f4b1dc91d65a2fdb7eb;hp=961a8cb7d38d7b9c2d149de888b1d8a44e8eea03;hpb=e8c5552df6bd8c7f2af122bfd3e940e9873b31b8;p=osm%2FSO.git diff --git a/BUILD.sh b/BUILD.sh index 961a8cb7..4eb05776 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -114,10 +114,10 @@ fi if [[ $PLATFORM == ub16 ]]; then PLATFORM_REPOSITORY=${1:-OSM} - PLATFORM_VERSION=${2:-4.4.0.0.57702} + PLATFORM_VERSION=${2:-4.4.2.1.61839} elif [[ $PLATFORM == fc20 ]]; then PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published - PLATFORM_VERSION=${2:-4.3.1.0.53705} + PLATFORM_VERSION=${2:-4.4.2.1.61839} else echo "Internal error: unknown platform $PLATFORM" exit 1 @@ -185,9 +185,11 @@ if [[ $PLATFORM == ub16 ]]; then # ignore failures PACKAGES="rw.toolchain-rwbase rw.toolchain-rwtoolchain rw.core.mgmt-mgmt rw.core.util-util \ - rw.core.rwvx-rwvx rw.core.rwvx-rwdts rw.automation.core-RWAUTO rw.core.rwvx-rwha-1.0" - for package in $PACKAGES; do - apt remove -y $package || true + rw.core.rwvx-rwvx rw.core.rwvx-rwdts rw.automation.core-RWAUTO" + # this package is obsolete. + OLD_PACKAGES="rw.core.rwvx-rwha-1.0" + for package in $PACKAGES $OLD_PACKAGES; do + sudo apt remove -y $package || true done packages="" @@ -208,6 +210,8 @@ if [[ $PLATFORM == ub16 ]]; then rw.core.mano-mano_yang_ylib-1.0 \ rw.core.mano-common-1.0 \ rw.core.mano-rwsdn_yang_ylib-1.0 \ + rw.core.mano-rwsdnal_yang_ylib-1.0 \ + rw.core.mano-rwsdn-1.0 \ rw.core.mano-mano-types_yang_ylib-1.0 \ rw.core.mano-rwcal-cloudsim-1.0 \ rw.core.mano-rwcal-1.0 \ @@ -301,12 +305,6 @@ else exit 1 fi -# install some base files used to create VNFs -test -d /usr/rift/images || mkdir /usr/rift/images -for file in Fedora-x86_64-20-20131211.1-sda-ping.qcow2 Fedora-x86_64-20-20131211.1-sda-pong.qcow2 Fedora-x86_64-20-20131211.1-sda.qcow2; do - test -f /usr/rift/images/$file || curl -o /usr/rift/images/$file http://repo.riftio.com/releases/open.riftio.com/4.3.1/$file -done - # If you are re-building SO, you just need to run # these two steps if ! $installSO; then