From 202103ed334461e6acd8e1d8a12d5153f1bb6f6a Mon Sep 17 00:00:00 2001 From: Leslie Giles Date: Tue, 27 Sep 2016 13:23:40 -0400 Subject: [PATCH] 59: Combine BUILD.sh and BUILD_UB.sh; make BUILD.sh more reliable and error-proof Signed-off-by: Leslie Giles --- BUILD.sh | 195 ++++++++++++++++++++++++++++++++++++++-------------- BUILD_UB.sh | 170 --------------------------------------------- 2 files changed, 143 insertions(+), 222 deletions(-) delete mode 100755 BUILD_UB.sh diff --git a/BUILD.sh b/BUILD.sh index b8a9d089..222ccad4 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -27,16 +27,24 @@ # # dependencies -- requires sudo rights +# Defensive bash programming flags +set -o errexit # Exit on any error +trap 'echo ERROR: Command failed: \"$BASH_COMMAND\"' ERR +set -o nounset # Expanding an unset variable is an error. Variables must be + # set before they can be used. + ############################################################################### # Options and arguments -params="$(getopt -o suhb: -l install-so,install-ui,build-ui:,help --name "$0" -- "$@")" +# There +params="$(getopt -o suhb: -l install-so,install-ui,no-mkcontainer,build-ui:,help --name "$0" -- "$@")" if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi eval set -- $params installSO=false installUI=false +runMkcontainer=true UIPathToBuild= while true; do @@ -44,6 +52,7 @@ while true; do -s|--install-so) installSO=true; shift;; -u|--install-ui) installUI=true; shift;; -b|--build-ui) shift; UIPathToBuild=$1; shift;; + --no-mkcontainer) runMkcontainer=false; shift;; -h|--help) echo echo "NAME:" @@ -61,6 +70,7 @@ while true; do echo " -s|--install-so: install SO from package" echo " -u|--install-ui: install UI from package" echo " -b|--build-ui PATH-TO-UI-REPO: build the UI in the specified repo" + echo " --no-mkcontainer: do not run mkcontainer, used for debugging script" echo " PLATFORM_REPOSITORY (optional): name of the RIFT.ware repository." echo " PLATFORM_VERSION (optional): version of the platform packages to be installed." echo @@ -80,79 +90,160 @@ if [[ $UIPathToBuild && ! -d $UIPathToBuild ]]; then exit 1 fi -PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published -PLATFORM_VERSION=${2:-4.3.1.0.49553-1} +# Turn this on after handling options, so the output doesn't get cluttered. +set -x # Print commands before executing them ############################################################################### -# Main block - -# Turn these on after handling options, so the output doesn't get cluttered. -set -o errexit # Exit on any error -set -x # Print commands before executing them +# Find the platform +if python -mplatform | grep -qi fedora; then + PLATFORM=fc20 +elif python -mplatform | grep -qi ubuntu; then + PLATFORM=ub16 +else + echo "Unknown platform" + exit 1 +fi -# must be run from the top of a workspace -cd $(dirname $0) +############################################################################### +# Set up repo and version +if [[ $PLATFORM == ub16 ]]; then + PLATFORM_REPOSITORY=${1:-OSM} + PLATFORM_VERSION=${2:-4.3.1.0.49556} +elif [[ $PLATFORM == fc20 ]]; then + PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published + PLATFORM_VERSION=${2:-4.3.1.0.49553-1} +else + echo "Internal error: unknown platform $PLATFORM" + exit 1 +fi +############################################################################### +# Main block +# must be run from the top of a workspace +cd $(dirname $0) # inside RIFT.io this is an NFS mount # so just to be safe test -h /usr/rift && sudo rm -f /usr/rift -# get the container tools from the correct repository -sudo rm -f /etc/yum.repos.d/private.repo -sudo curl -o /etc/yum.repos.d/${PLATFORM_REPOSITORY}.repo \ - http://buildtracker.riftio.com/repo_file/fc20/${PLATFORM_REPOSITORY}/ -sudo yum install --assumeyes rw.tools-container-tools rw.tools-scripts - +if [[ $PLATFORM == ub16 ]]; then + # enable the right repos + curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add - + sudo curl -o /etc/apt/sources.list.d/${PLATFORM_REPOSITORY}.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/ + sudo apt-get update + + # and install the tools + sudo apt remove -y rw.toolchain-rwbase tcpdump + sudo apt-get install -y rw.tools-container-tools rw.tools-scripts python +elif [[ $PLATFORM == fc20 ]]; then + # get the container tools from the correct repository + sudo rm -f /etc/yum.repos.d/private.repo + sudo curl -o /etc/yum.repos.d/${PLATFORM_REPOSITORY}.repo \ + http://buildtracker.riftio.com/repo_file/fc20/${PLATFORM_REPOSITORY}/ + sudo yum install --assumeyes rw.tools-container-tools rw.tools-scripts +else + echo "Internal error: unknown platform $PLATFORM" + exit 1 +fi # enable the OSM repository hosted by RIFT.io # this contains the RIFT platform code and tools # and install of the packages required to build and run # this module -sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY} - -temp=$(mktemp -d /tmp/rw.XXX) -pushd $temp - -# yum does not accept the --nodeps and --replacefiles options so we -# download first and then install -yumdownloader rw.toolchain-rwbase-${PLATFORM_VERSION} \ - rw.toolchain-rwtoolchain-${PLATFORM_VERSION} \ - rw.core.mgmt-mgmt-${PLATFORM_VERSION} \ - rw.core.util-util-${PLATFORM_VERSION} \ - rw.core.rwvx-rwvx-${PLATFORM_VERSION} \ - rw.core.rwvx-rwha-1.0-${PLATFORM_VERSION} \ - rw.core.rwvx-rwdts-${PLATFORM_VERSION} \ - rw.automation.core-RWAUTO-${PLATFORM_VERSION} +if $runMkcontainer; then + sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY} +fi -sudo rpm -i --replacefiles --nodeps *rpm -popd -rm -rf $temp -# this file gets in the way of the one generated by the build -sudo rm -f /usr/rift/usr/lib/libmano_yang_gen.so +if [[ $PLATFORM == ub16 ]]; then + # install the RIFT platform code: + sudo apt-get install -y rw.toolchain-rwbase=${PLATFORM_VERSION} \ + rw.toolchain-rwtoolchain=${PLATFORM_VERSION} \ + rw.core.mgmt-mgmt=${PLATFORM_VERSION} \ + rw.core.util-util=${PLATFORM_VERSION} \ + rw.core.rwvx-rwvx=${PLATFORM_VERSION} \ + rw.core.rwvx-rwdts=${PLATFORM_VERSION} \ + rw.automation.core-RWAUTO=${PLATFORM_VERSION} \ + rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION} + + sudo chmod 777 /usr/rift /usr/rift/usr/share + + if $installSO; then + sudo apt-get install -y \ + rw.core.mc-\*=${PLATFORM_VERSION} + fi + + if $installUI; then + sudo apt-get install -y \ + rw.ui-about=${PLATFORM_VERSION} \ + rw.ui-logging=${PLATFORM_VERSION} \ + rw.ui-skyquake=${PLATFORM_VERSION} \ + rw.ui-accounts=${PLATFORM_VERSION} \ + rw.ui-composer=${PLATFORM_VERSION} \ + rw.ui-launchpad=${PLATFORM_VERSION} \ + rw.ui-debug=${PLATFORM_VERSION} \ + rw.ui-config=${PLATFORM_VERSION} \ + rw.ui-dummy_component=${PLATFORM_VERSION} + fi +elif [[ $PLATFORM == fc20 ]]; then + + temp=$(mktemp -d /tmp/rw.XXX) + pushd $temp + + # yum does not accept the --nodeps and --replacefiles options so we + # download first and then install + yumdownloader rw.toolchain-rwbase-${PLATFORM_VERSION} \ + rw.toolchain-rwtoolchain-${PLATFORM_VERSION} \ + rw.core.mgmt-mgmt-${PLATFORM_VERSION} \ + rw.core.util-util-${PLATFORM_VERSION} \ + rw.core.rwvx-rwvx-${PLATFORM_VERSION} \ + rw.core.rwvx-rwha-1.0-${PLATFORM_VERSION} \ + rw.core.rwvx-rwdts-${PLATFORM_VERSION} \ + rw.automation.core-RWAUTO-${PLATFORM_VERSION} + + # Install one at a time so that pre-installed packages will not cause a failure + for pkg in *rpm; do + # Check to see if the package is already installed; do not try to install + # it again if it does, since this causes rpm -i to return failure. + if rpm -q $(rpm -q -p $pkg) >/dev/null; then + echo "WARNING: package already installed: $pkg" + else + sudo rpm -i --replacefiles --nodeps $pkg + fi + done + + popd + rm -rf $temp + + # this file gets in the way of the one generated by the build + sudo rm -f /usr/rift/usr/lib/libmano_yang_gen.so -sudo chmod 777 /usr/rift /usr/rift/usr/share + sudo chmod 777 /usr/rift /usr/rift/usr/share -if $installSO; then - sudo apt-get install -y \ - rw.core.mc-\*-${PLATFORM_VERSION} -fi + if $installSO; then + sudo apt-get install -y \ + rw.core.mc-\*-${PLATFORM_VERSION} + fi + + if $installUI; then + sudo apt-get install -y \ + rw.ui-about-${PLATFORM_VERSION} \ + rw.ui-logging-${PLATFORM_VERSION} \ + rw.ui-skyquake-${PLATFORM_VERSION} \ + rw.ui-accounts-${PLATFORM_VERSION} \ + rw.ui-composer-${PLATFORM_VERSION} \ + rw.ui-launchpad-${PLATFORM_VERSION} \ + rw.ui-debug-${PLATFORM_VERSION} \ + rw.ui-config-${PLATFORM_VERSION} \ + rw.ui-dummy_component-${PLATFORM_VERSION} + fi -if $installUI; then - sudo apt-get install -y \ - rw.ui-about-${PLATFORM_VERSION} \ - rw.ui-logging-${PLATFORM_VERSION} \ - rw.ui-skyquake-${PLATFORM_VERSION} \ - rw.ui-accounts-${PLATFORM_VERSION} \ - rw.ui-composer-${PLATFORM_VERSION} \ - rw.ui-launchpad-${PLATFORM_VERSION} \ - rw.ui-debug-${PLATFORM_VERSION} \ - rw.ui-config-${PLATFORM_VERSION} \ - rw.ui-dummy_component-${PLATFORM_VERSION} +else + echo "Internal error: unknown platform $PLATFORM" + exit 1 fi # install some base files used to create VNFs diff --git a/BUILD_UB.sh b/BUILD_UB.sh deleted file mode 100755 index 2fb32f8c..00000000 --- a/BUILD_UB.sh +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2016 RIFT.IO Inc -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Author(s): Jeremy Mordkoff, Lezz Giles -# Creation Date: 8 Sep 2016 -- cloned from BUILD.sh and adapated for Ubuntu -# -# - -# BUILD_UB.sh -# -# This is a top-level build script for RIFT.io -# -# Arguments and options: use -h or --help -# -# dependencies -- requires sudo rights - -############################################################################### -# Options and arguments - -params="$(getopt -o suhb: -l install-so,install-ui,build-ui:,help --name "$0" -- "$@")" -if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi - -eval set -- $params - -installSO=false -installUI=false -UIPathToBuild= - -while true; do - case "$1" in - -s|--install-so) installSO=true; shift;; - -u|--install-ui) installUI=true; shift;; - -b|--build-ui) shift; UIPathToBuild=$1; shift;; - -h|--help) - echo - echo "NAME:" - echo " $0" - echo - echo "SYNOPSIS:" - echo " $0 -h|--help" - echo " $0 [-s] [-u|-b PATH-TO-UI-REPO] [PLATFORM_REPOSITORY] [PLATFORM_VERSION]" - echo - echo "DESCRIPTION:" - echo " Prepare current system to run SO and UI. By default, the system" - echo " is set up to support building SO and UI; optionally, either or" - echo " both SO and UI can be installed from a Debian package repository." - echo - echo " -s|--install-so: install SO from package" - echo " -u|--install-ui: install UI from package" - echo " -b|--build-ui PATH-TO-UI-REPO: build the UI in the specified repo" - echo " PLATFORM_REPOSITORY (optional): name of the RIFT.ware repository." - echo " PLATFORM_VERSION (optional): version of the platform packages to be installed." - echo - exit 0;; - --) shift; break;; - *) echo "Not implemented: $1" >&2; exit 1;; - esac -done - -if $installUI && [[ $UIPathToBuild ]]; then - echo "Cannot both install and build the UI!" - exit 1 -fi - -if [[ $UIPathToBuild && ! -d $UIPathToBuild ]]; then - echo "Not a directory: $UIPathToBuild" - exit 1 -fi - - -PLATFORM_REPOSITORY=${1:-OSM} -PLATFORM_VERSION=${2:-4.3.1.0.49556} - -############################################################################### -# Main block - -# Turn these on after handling options, so the output doesn't get cluttered. -set -o errexit # Exit on any error -set -x # Print commands before executing them - -# must be run from the top of a workspace -cd $(dirname $0) - -# inside RIFT.io this is an NFS mount -# so just to be safe -test -h /usr/rift && sudo rm -f /usr/rift - -# enable the right repos -curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add - -sudo curl -o /etc/apt/sources.list.d/${PLATFORM_REPOSITORY}.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/ -sudo apt-get update - -# and install the tools -sudo apt remove -y rw.toolchain-rwbase tcpdump -sudo apt-get install -y rw.tools-container-tools rw.tools-scripts python - -# enable the OSM repository hosted by RIFT.io -# this contains the RIFT platform code and tools -# and install of the packages required to build and run -# this module -sudo -H /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY} - - - -# install the RIFT platform code: -sudo apt-get install -y rw.toolchain-rwbase=${PLATFORM_VERSION} \ - rw.toolchain-rwtoolchain=${PLATFORM_VERSION} \ - rw.core.mgmt-mgmt=${PLATFORM_VERSION} \ - rw.core.util-util=${PLATFORM_VERSION} \ - rw.core.rwvx-rwvx=${PLATFORM_VERSION} \ - rw.core.rwvx-rwdts=${PLATFORM_VERSION} \ - rw.automation.core-RWAUTO=${PLATFORM_VERSION} \ - rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION} - -sudo chmod 777 /usr/rift /usr/rift/usr/share - -if $installSO; then - sudo apt-get install -y \ - rw.core.mc-\*=${PLATFORM_VERSION} -fi - -if $installUI; then - sudo apt-get install -y \ - rw.ui-about=${PLATFORM_VERSION} \ - rw.ui-logging=${PLATFORM_VERSION} \ - rw.ui-skyquake=${PLATFORM_VERSION} \ - rw.ui-accounts=${PLATFORM_VERSION} \ - rw.ui-composer=${PLATFORM_VERSION} \ - rw.ui-launchpad=${PLATFORM_VERSION} \ - rw.ui-debug=${PLATFORM_VERSION} \ - rw.ui-config=${PLATFORM_VERSION} \ - rw.ui-dummy_component=${PLATFORM_VERSION} -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 - make -j16 - sudo make install -fi - -if [[ $UIPathToBuild ]]; then - make -C $UIPathToBuild -j16 - sudo make -C $UIPathToBuild install -fi - -echo "To run SO with UI please run:" -echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode' -echo -echo "To run SO without UI please run:" -echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode --no-ui' -- 2.25.1