X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_oran.sh;h=12dce7bc9dc521ec455d1ff3bd2f4933c69fc01c;hb=f87e7ddc6c57b1f2f38727a24408d52c2872cc18;hp=e0c21983e9e96858304cd8480245927d055f6f7e;hpb=1e794a475c79dc9a3abb85fd3bee0cbb3124ffe6;p=pti%2Frtp.git

diff --git a/scripts/build_oran.sh b/scripts/build_oran.sh
index e0c2198..12dce7b 100755
--- a/scripts/build_oran.sh
+++ b/scripts/build_oran.sh
@@ -1,4 +1,21 @@
 #!/bin/bash
+#
+# Copyright (C) 2019 Wind River Systems, 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.
+
+# Ensure we fail the job if any steps fail.
+set -e -o pipefail
 
 help_info () {
 cat << ENDHELP
@@ -9,6 +26,7 @@ where:
     -n dry-run only for bitbake
     -h this help info
     -e EXTRA_CONF is the pat for extra config file
+    -r whether to inherit rm_work (default is Yes)
 ENDHELP
 }
 
@@ -32,23 +50,44 @@ if [ $# -eq 0 ]; then
     exit
 fi
 
+check_yn_rm_work () {
+    yn="$1"
+    case ${yn} in
+        [Yy]|[Yy]es)
+            RM_WORK="Yes"
+            ;;
+        [Nn]|[Nn]o)
+            RM_WORK="No"
+            ;;
+        *)
+            echo "Invalid arg for -r option."
+            help_info
+            exit 1
+            ;;
+    esac
+}
+
 DRYRUN=""
 EXTRA_CONF=""
+RM_WORK="Yes"
 
 SCRIPTS_DIR=`dirname $0`
 SCRIPTS_DIR=`readlink -f $SCRIPTS_DIR`
 
-while getopts "w:e:nh" OPTION; do
+while getopts "w:e:r:nh" OPTION; do
     case ${OPTION} in
         w)
             WORKSPACE=`readlink -f ${OPTARG}`
             ;;
         e)
             EXTRA_CONF=`readlink -f ${OPTARG}`
-	    ;;
+            ;;
         n)
             DRYRUN="-n"
             ;;
+        r)
+            check_yn_rm_work ${OPTARG}
+            ;;
         h)
             help_info
             exit
@@ -87,8 +126,10 @@ ${RUN_CMD}
 if cd ${SCRIPTS_DIR} && git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
     CLONED_ORAN_REPO=`dirname ${SCRIPTS_DIR}`
     echo_info "Use the cloned oran repo: ${CLONED_ORAN_REPO}"
-    cd ${SRC_ORAN_DIR}
-    ln -sf ${CLONED_ORAN_REPO} rtp
+    mkdir ${SRC_ORAN_DIR}/rtp
+    cd ${SRC_ORAN_DIR}/rtp
+    ln -sf ${CLONED_ORAN_REPO}/meta-oran meta-oran
+    ln -sf ${CLONED_ORAN_REPO}/scripts scripts
 else
     echo_info "Cloning oran layer:"
     cd ${SRC_ORAN_DIR}
@@ -117,8 +158,15 @@ cat << EOF >> conf/local.conf
 DISTRO = "oran-inf"
 BB_NO_NETWORK = '0'
 WRTEMPLATE += "feature/oran-host-rt-tune"
+
+# Work around for CI build
+IMAGE_INSTALL_remove = "ceph"
 EOF
 
+if [ "${RM_WORK}" == "Yes" ]; then
+    echo "INHERIT += 'rm_work'" >> conf/local.conf
+fi
+
 if [ "${EXTRA_CONF}" != "" ] && [ -f "${EXTRA_CONF}" ]; then
     cat ${EXTRA_CONF} >> conf/local.conf
 fi
@@ -126,7 +174,6 @@ fi
 # Build the oran-inf-host image
 mkdir -p logs
 TIMESTAMP=`date +"%Y%m%d_%H%M%S"`
-set -o pipefail
 RUN_CMD="bitbake ${DRYRUN} oran-image-inf-host"
 echo_cmd "Build the oran-image-inf-host image"
 bitbake ${DRYRUN} oran-image-inf-host 2>&1|tee logs/bitbake_oran-image-inf-host_${TIMESTAMP}.log