X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_inf_debian%2Fbuild_inf_debian.sh;h=96c96ecae4d2acb1e8a214ac0daaaf38a0256737;hb=c99cd24e81f9571f2d676a35dc181b445b65a22d;hp=401f5c259343135d5fb7be6df8576761df217f9a;hpb=2abf0c6e52980f28c3a4577c167de1fcbacb54db;p=pti%2Frtp.git

diff --git a/scripts/build_inf_debian/build_inf_debian.sh b/scripts/build_inf_debian/build_inf_debian.sh
index 401f5c2..96c96ec 100755
--- a/scripts/build_inf_debian/build_inf_debian.sh
+++ b/scripts/build_inf_debian/build_inf_debian.sh
@@ -25,8 +25,8 @@ SRC_ORAN_BRANCH="master"
 
 SRC_ORAN_URL="https://gerrit.o-ran-sc.org/r/pti/rtp"
 
-STX_VER="8.0"
-ORAN_REL="ORAN G-Release (${STX_VER})"
+STX_VER="9.0"
+ORAN_REL="ORAN J-Release (${STX_VER})"
 
 SCRIPTS_DIR=$(dirname $(readlink -f $0))
 SCRIPTS_NAME=$(basename $0)
@@ -39,10 +39,11 @@ TIMESTAMP=`date +"%Y%m%d_%H%M%S"`
 help_info () {
 cat << ENDHELP
 Usage:
-${SCRIPTS_NAME} [-w WORKSPACE_DIR] [-m] [-n] [-u] [-h]
+${SCRIPTS_NAME} [-w WORKSPACE_DIR] [-p PARALLEL_BUILD] [-m] [-n] [-u] [-h]
 where:
     -w WORKSPACE_DIR is the path for the project
-    -m use mirror for src and rpm pkgs
+    -p PARALLEL_BUILD is the num of paralle build, default is 2
+    -m use mirror for src and deb pkgs
     -n dry-run only for bitbake
     -h this help info
 examples:
@@ -87,17 +88,23 @@ run_cmd () {
 
 DRYRUN=""
 USE_MIRROR="No"
+REUSE_APTLY=""
+STX_PARALLEL="2"
 
-while getopts "w:mnh" OPTION; do
+while getopts "w:p:mnh" OPTION; do
     case ${OPTION} in
         w)
             WORKSPACE=`readlink -f ${OPTARG}`
             ;;
+        p)
+            STX_PARALLEL="${OPTARG}"
+            ;;
         n)
             DRYRUN="-n"
             ;;
         m)
             USE_MIRROR="Yes"
+            REUSE_APTLY="--reuse"
             ;;
         h)
             help_info
@@ -118,12 +125,11 @@ fi
 # "_" can't be used in project name
 PRJ_NAME=prj-oran-stx-deb
 
-# stx 8.0 is not released yet
-#STX_SRC_BRANCH="r/stx.${STX_VER}"
+STX_SRC_BRANCH="r/stx.${STX_VER}"
 
 # Temporary for master
-STX_TAG="master-3a9d121"
-STX_SRC_BRANCH="master"
+#STX_TAG="master-1ba0db8"
+#STX_SRC_BRANCH="master"
 
 STX_LOCAL_DIR=${WORKSPACE}/localdisk
 STX_LOCAL_SRC_DIR=${STX_LOCAL_DIR}/designer/${USER}/${PRJ_NAME}
@@ -132,15 +138,20 @@ STX_SRC_DIR=${WORKSPACE}/src
 STX_PRJ_DIR=${WORKSPACE}/${PRJ_NAME}
 STX_PRJ_OUTPUT=${WORKSPACE}/prj_output
 STX_MIRROR_DIR=${WORKSPACE}/mirrors
+STX_APTLY_DIR=${WORKSPACE}/aptly
 STX_MINIKUBE_HOME=${WORKSPACE}/minikube_home
 STX_MANIFEST_URL="https://opendev.org/starlingx/manifest"
 
-#MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_VER}
-#MIRROR_CONTAINER_IMG=infbuilder/inf-debian-mirror:2022.11-stx-${STX_VER}
-MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_TAG}
-MIRROR_CONTAINER_IMG=infbuilder/inf-debian-mirror:2022.11-stx-${STX_TAG}
+MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_VER}
+#MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_TAG}
+MIRROR_CONTAINER_IMG=infbuilder/inf-debian-mirror:2022.11-stx-${STX_VER}
+MIRROR_APTLY_IMG=infbuilder/inf-debian-aptly:2022.11-stx-${STX_VER}
+
+STX_SHARED_REPO=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/debian/monolithic/20221123T070000Z/outputs/aptly/deb-local-build/
+STX_SHARED_SOURCE=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/debian/monolithic/20221123T070000Z/outputs/aptly/deb-local-source/
 
-SRC_META_PATCHES=${SCRIPTS_DIR}/meta-patches
+SRC_ORAN_DIR=${STX_SRC_DIR}/rtp
+SRC_META_PATCHES=${SRC_ORAN_DIR}/scripts/build_inf_debian/meta-patches
 
 ISO_INF_DEB=inf-image-debian-all-x86-64.iso
 
@@ -148,7 +159,8 @@ prepare_workspace () {
     msg_step="Create workspace for the Debian build"
     echo_step_start
 
-    mkdir -p ${STX_LOCAL_SRC_DIR} ${STX_LOCAL_PRJ_DIR} ${STX_MIRROR_DIR} ${STX_PRJ_OUTPUT} ${STX_MINIKUBE_HOME}
+    mkdir -p ${STX_LOCAL_SRC_DIR} ${STX_LOCAL_PRJ_DIR} ${STX_MIRROR_DIR} \
+        ${STX_APTLY_DIR} ${STX_PRJ_OUTPUT} ${STX_MINIKUBE_HOME}
     rm -f ${STX_SRC_DIR} ${STX_PRJ_DIR}
     ln -sf $(realpath --relative-to=${WORKSPACE} ${STX_LOCAL_SRC_DIR}) ${STX_SRC_DIR}
     ln -sf $(realpath --relative-to=${WORKSPACE} ${STX_LOCAL_PRJ_DIR}) ${STX_PRJ_DIR}
@@ -219,6 +231,8 @@ repo_init_sync () {
 
         RUN_CMD="repo sync --force-sync"
         run_cmd "repo sync"
+
+        touch .repo-init-done
     fi
 
     echo_step_end
@@ -244,6 +258,7 @@ get_mirror_src () {
         tar xf stx-${STX_TAG}.tar.bz2
         mv stx-${STX_SRC_BRANCH}/* stx-${STX_SRC_BRANCH}/.repo .
         rm -rf stx-${STX_SRC_BRANCH} stx-${STX_TAG}.tar.bz2
+        touch .repo-init-done
 
     fi
 
@@ -254,28 +269,116 @@ get_mirror_pkg () {
     msg_step="Get deb mirror from dockerhub image"
     echo_step_start
 
-    if [ -d ${MIRROR_CONTAINER_IMG}/starlingx ]; then
+    if [ -d ${STX_MIRROR_DIR}/starlingx ]; then
         echo_info "The deb mirror already exists, skipping"
     else
         docker pull ${MIRROR_CONTAINER_IMG}
         docker create -ti --name inf-debian-mirror ${MIRROR_CONTAINER_IMG} sh
-        #docker cp inf-debian-mirror:/mirror_stx-${STX_VER}/. ${STX_MIRROR_DIR}
-        docker cp inf-debian-mirror:/mirror_stx-${STX_TAG}/. ${STX_MIRROR_DIR}
+        docker cp inf-debian-mirror:/mirror-stx-${STX_VER}/. ${STX_MIRROR_DIR}
         docker rm inf-debian-mirror
     fi
 
     echo_step_end
 }
 
+get_mirror_aptly () {
+    msg_step="Get deb mirror aptly from dockerhub image"
+    echo_step_start
+
+    if [ -f ${STX_APTLY_DIR}/aptly.conf ]; then
+        echo_info "The deb aptly already exists, skipping"
+    else
+        docker pull ${MIRROR_APTLY_IMG}
+        docker create -ti --name inf-debian-aptly ${MIRROR_APTLY_IMG} sh
+        docker cp inf-debian-aptly:/aptly-stx-${STX_VER}/. ${STX_APTLY_DIR}
+        docker rm inf-debian-aptly
+    fi
+
+    echo_step_end
+}
+
+clone_update_repo () {
+    REPO_BRANCH=$1
+    REPO_URL=$2
+    REPO_NAME=$3
+    REPO_COMMIT=$4
+
+    if [ -d ${REPO_NAME}/.git ]; then
+        if [ "${SKIP_UPDATE}" == "Yes" ]; then
+            echo_info "The repo ${REPO_NAME} exists, skip updating for the branch ${REPO_BRANCH}"
+        else
+            echo_info "The repo ${REPO_NAME} exists, updating for the branch ${REPO_BRANCH}"
+            cd ${REPO_NAME}
+            git checkout ${REPO_BRANCH}
+            git pull
+            cd -
+        fi
+    else
+        RUN_CMD="git clone --branch ${REPO_BRANCH} ${REPO_URL} ${REPO_NAME}"
+        run_cmd "Cloning the source of repo '${REPO_NAME}':"
+
+        if [ -n "${REPO_COMMIT}" ]; then
+            cd ${REPO_NAME}
+            RUN_CMD="git checkout -b ${REPO_BRANCH}-${REPO_COMMIT} ${REPO_COMMIT}"
+            run_cmd "Checkout the repo ${REPO_NAME} to specific commit: ${REPO_COMMIT}"
+            cd -
+        fi
+    fi
+}
+
+
+prepare_src () {
+    msg_step="Get the source code repos"
+    echo_step_start
+
+    # Clone the oran inf source if it's not already cloned
+    # Check if the script is inside the repo
+    if cd ${SCRIPTS_DIR} && git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
+        CLONED_ORAN_REPO=`git rev-parse --show-toplevel`
+        echo_info "Use the cloned oran repo: ${CLONED_ORAN_REPO}"
+        mkdir -p ${SRC_ORAN_DIR}
+        cd ${SRC_ORAN_DIR}
+        rm -rf scripts
+        ln -sf ${CLONED_ORAN_REPO}/scripts scripts
+    else
+        echo_info "Cloning oran layer:"
+        cd ${STX_SRC_DIR}
+        clone_update_repo ${SRC_ORAN_BRANCH} ${SRC_ORAN_URL} rtp
+    fi
+
+    if [ "${USE_MIRROR}" == "Yes" ]; then
+        get_mirror_src
+        get_mirror_pkg
+        get_mirror_aptly
+    else
+        repo_init_sync
+    fi
+    patch_src
+
+    echo_step_end
+}
+
+
 patch_src () {
-    echo_step_start "Some source codes need to be patched for INF project"
+    echo_step_start "Patching source codes for INF project"
 
     STX_ISSUE_DIR="${STX_REPO_ROOT}/cgcs-root/stx/config-files/debian-release-config/files"
+    echo_info "Patching for the ${STX_ISSUE_DIR}"
     grep -q "${ORAN_REL}" ${STX_ISSUE_DIR}/issue* \
         || sed -i "s/\(@PLATFORM_RELEASE@\)/\1 - ${ORAN_REL}/" ${STX_ISSUE_DIR}/issue*
 
-    # Apply meta patches
+    STX_BUILDER="${STX_REPO_ROOT}/stx-tools/stx/lib/stx/stx_build.py"
+    echo_info "Patching for the ${STX_BUILDER}"
+    grep -q "\-\-parallel" ${STX_BUILDER} \
+        || sed -i "s/\(build-pkgs -a \)/\1 --parallel ${STX_PARALLEL} ${REUSE_APTLY}/" \
+        ${STX_BUILDER}
+
+    STX_LOCALRC="${STX_REPO_ROOT}/stx-tools/stx/stx-build-tools-chart/stx-builder/configmap/localrc.sample"
+    echo_info "Patching for the localrc file"
+    echo "export STX_SHARED_REPO=${STX_SHARED_REPO}" >> ${STX_LOCALRC}
+    echo "export STX_SHARED_SOURCE=${STX_SHARED_SOURCE}" >> ${STX_LOCALRC}
 
+    # Apply meta patches
     if [ -d ${SRC_META_PATCHES} ]; then
         cd ${SRC_META_PATCHES}
         src_dirs=$(find . -type f -printf "%h\n"|uniq)
@@ -352,10 +455,10 @@ build_image () {
     RUN_CMD="stx repomgr list"
     run_cmd "repomgr list"
 
-    RUN_CMD="stx shell -c 'build-pkgs -a --parallel 10'"
+    RUN_CMD="stx build world"
     run_cmd "Build-pkgs"
 
-    RUN_CMD="stx shell -c 'build-image'"
+    RUN_CMD="stx build image"
     run_cmd "Build ISO image"
 
     cp -f ${STX_LOCAL_DIR}/deploy/starlingx-intel-x86-64-cd.iso ${STX_PRJ_OUTPUT}/${ISO_INF_DEB}
@@ -371,12 +474,6 @@ build_image () {
 
 prepare_workspace
 create_env
-if [ "${USE_MIRROR}" == "Yes" ]; then
-    get_mirror_src
-    #get_mirror_pkg
-else
-    repo_init_sync
-fi
-patch_src
+prepare_src
 init_stx_tool
 build_image