From c17db01b05204047f1e5c8560438728d55441714 Mon Sep 17 00:00:00 2001 From: Jokin Garay Date: Wed, 8 Mar 2017 17:45:39 +0100 Subject: [PATCH] FATAL traces in installer Change-Id: I73563594cc835183376bdc46932cc2db0b9e5925 Signed-off-by: Jokin Garay --- installers/install_from_source.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/installers/install_from_source.sh b/installers/install_from_source.sh index fbf0f021..33dffbde 100755 --- a/installers/install_from_source.sh +++ b/installers/install_from_source.sh @@ -66,7 +66,7 @@ function update(){ lxc exec $CONTAINER -- git -C $INSTALL_FOLDER fetch --all BRANCH="" BRANCH=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER status -sb | head -n1 | sed -n 's/^## \(.*\).*/\1/p'|awk '{print $1}' |sed 's/\(.*\)\.\.\..*/\1/'` - [ -z "$BRANCH" ] && echo " Could not find the current branch in use in the $MDG" && exit 1 + [ -z "$BRANCH" ] && FATAL "Could not find the current branch in use in the '$MDG'" CURRENT=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER status |head -n1` CURRENT_COMMIT_ID=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER rev-parse HEAD` echo " FROM: $CURRENT ($CURRENT_COMMIT_ID)" @@ -102,7 +102,7 @@ function update(){ lxc exec $CONTAINER -- git -C $INSTALL_FOLDER fetch --all BRANCH="" BRANCH=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER status -sb | head -n1 | sed -n 's/^## \(.*\).*/\1/p'|awk '{print $1}' |sed 's/\(.*\)\.\.\..*/\1/'` - [ -z "$BRANCH" ] && echo " Could not find the current branch in use in the $MDG" && exit 1 + [ -z "$BRANCH" ] && FATAL "Could not find the current branch in use in the '$MDG'" CURRENT=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER status |head -n1` CURRENT_COMMIT_ID=`lxc exec $CONTAINER -- git -C $INSTALL_FOLDER rev-parse HEAD` echo " FROM: $CURRENT ($CURRENT_COMMIT_ID)" @@ -290,10 +290,10 @@ echo -e "\nChecking required packages: wget, curl, tar" dpkg -l wget curl tar &>/dev/null || ! echo -e " One or several packages are not installed.\nInstalling required packages\n Root privileges are required" || sudo apt install -y wget curl tar echo -e "\nCreating the containers and building ..." -$OSM_DEVOPS/jenkins/host/start_build RO --notest checkout $COMMIT_ID -$OSM_DEVOPS/jenkins/host/start_build VCA -$OSM_DEVOPS/jenkins/host/start_build SO checkout $COMMIT_ID -$OSM_DEVOPS/jenkins/host/start_build UI checkout $COMMIT_ID +$OSM_DEVOPS/jenkins/host/start_build RO --notest checkout $COMMIT_ID || FATAL "RO container build failed (refspec: '$COMMIT_ID')" +$OSM_DEVOPS/jenkins/host/start_build VCA || FATAL "VCA container build failed" +$OSM_DEVOPS/jenkins/host/start_build SO checkout $COMMIT_ID || FATAL "SO container build failed (refspec: '$COMMIT_ID')" +$OSM_DEVOPS/jenkins/host/start_build UI checkout $COMMIT_ID || FATAL "UI container build failed (refspec: '$COMMIT_ID')" #Install iptables-persistent and configure NAT rules nat -- 2.25.1