X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_inf.sh;h=9f092ef7b1f2efe107cac1c56abde6d0c65f72cc;hb=refs%2Fchanges%2F65%2F9565%2F1;hp=0710d89493f0a5e6e2bd33dfd38027297545ea93;hpb=b7bf0fac172585c8efb9107fc5d2638373390868;p=pti%2Frtp.git diff --git a/scripts/build_inf.sh b/scripts/build_inf.sh index 0710d89..9f092ef 100755 --- a/scripts/build_inf.sh +++ b/scripts/build_inf.sh @@ -22,6 +22,7 @@ set -e -o pipefail ######################################################################### SCRIPTS_DIR=$(dirname $(readlink -f $0)) +SCRIPTS_NAME=$(basename $0) TIMESTAMP=`date +"%Y%m%d_%H%M%S"` ######################################################################### @@ -34,7 +35,7 @@ Note: This is a wrapper script to build both Yocto based and CentOS based images with default options, and tend to be used by ORAN CI build only. Usage: -$(basename $0) [-w WORKSPACE_DIR] [-n] [-h] +${SCRIPTS_NAME} [-w WORKSPACE_DIR] [-n] [-h] where: -w WORKSPACE_DIR is the path for the project -n dry-run only for bitbake @@ -48,14 +49,14 @@ ENDHELP echo_step_start() { [ -n "$1" ] && msg_step=$1 echo "#########################################################################################" - echo "## STEP START: ${msg_step}" + echo "## ${SCRIPTS_NAME} - STEP START: ${msg_step}" echo "#########################################################################################" } echo_step_end() { [ -n "$1" ] && msg_step=$1 echo "#########################################################################################" - echo "## STEP END: ${msg_step}" + echo "## ${SCRIPTS_NAME} - STEP END: ${msg_step}" echo "#########################################################################################" echo } @@ -68,13 +69,13 @@ echo_error () { echo "ERROR: $1" } -echo_cmd () { +run_cmd () { echo echo_info "$1" echo "CMD: ${RUN_CMD}" + ${RUN_CMD} } - ######################################################################### # Parse cmd options ######################################################################### @@ -159,12 +160,25 @@ if [ "$CI" = "true" ]; then get_debug_info fi +msg_step="Yocto builds" +echo_step_start + +RUN_CMD="${SCRIPT_YP} -w ${WORKSPACE_YP} ${DRYRUN} ${YP_ARGS}" +run_cmd "Start Yocto builds" + +echo_step_end + # dry-run is not supported yet for CentOS build if [ -z "${DRYRUN}" ]; then - ${SCRIPT_CENTOS} -w ${WORKSPACE_CENTOS} ${DRYRUN} + msg_step="CentOS builds" + echo_step_start + if [ "$CI" = "true" ]; then - ${SCRIPT_CENTOS_PRE} -w ${WORKSPACE_CENTOS} + RUN_CMD="${SCRIPT_CENTOS_PRE} -w ${WORKSPACE_CENTOS}" + run_cmd "Prepare for CentOS builds" fi -fi + RUN_CMD="${SCRIPT_CENTOS} -w ${WORKSPACE_CENTOS} ${DRYRUN}" + run_cmd "Start CentOS builds" -${SCRIPT_YP} -w ${WORKSPACE_YP} ${DRYRUN} ${YP_ARGS} + echo_step_end +fi