build_inf_centos.sh: update the branch for g-release

[pti/rtp.git] / scripts / build_inf_centos / build_inf_centos.sh

diff --git a/scripts/build_inf_centos/build_inf_centos.sh b/scripts/build_inf_centos/build_inf_centos.sh
index 399157b..19997ad 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_centos.sh
+++ b/scripts/build_inf_centos/build_inf_centos.sh
@@ -21,11 +21,11 @@ set -e -o pipefail
 # Variables
 #########################################################################
 
-SRC_ORAN_BRANCH="master"
+SRC_ORAN_BRANCH="g-release"
 
 SRC_ORAN_URL="https://gerrit.o-ran-sc.org/r/pti/rtp"
 
-STX_VER="6.0"
+STX_VER="7.0"
 ORAN_REL="ORAN G-Release (${STX_VER})"
 
 SCRIPTS_DIR=$(dirname $(readlink -f $0))
@@ -127,7 +127,7 @@ STX_MIRROR_DIR=${WORKSPACE}/mirror
 STX_MANIFEST_URL="https://opendev.org/starlingx/manifest"
 
 MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_VER}
-MIRROR_CONTAINER_IMG=infbuilder/inf-centos-mirror:2022.05-stx-${STX_VER}
+MIRROR_CONTAINER_IMG=infbuilder/inf-centos-mirror:2022.11-stx-${STX_VER}
 
 SRC_META_PATCHES=${SCRIPTS_DIR}/meta-patches
 
@@ -227,6 +227,9 @@ repo_init_sync () {
     msg_step="Init the repo and sync"
     echo_step_start
 
+    # Avoid the colorization prompt
+    git config --global color.ui false
+
     cd ${MY_REPO_ROOT_DIR}
     STX_MANIFEST="default.xml"
     if [ "$LAYER" != "" ]; then
@@ -246,15 +249,19 @@ get_mirror_src () {
     msg_step="Get src mirror from dockerhub image"
     echo_step_start
 
-    docker pull ${MIRROR_SRC_STX}
-    docker create -ti --name inf-src-stx ${MIRROR_SRC_STX} sh
-    docker cp inf-src-stx:/stx-${STX_VER}.tar.bz2 ${MY_REPO_ROOT_DIR}
-    docker rm inf-src-stx
-
-    cd ${MY_REPO_ROOT_DIR}
-    tar xf stx-${STX_VER}.tar.bz2
-    mv stx-${STX_VER}/* stx-${STX_VER}/.repo .
-    rm -rf stx-${STX_VER} stx-${STX_VER}.tar.bz2
+    if [ -d ${MY_REPO_ROOT_DIR}/.repo ]; then
+        echo_info "The src repos already exists, skipping"
+    else
+        docker pull ${MIRROR_SRC_STX}
+        docker create -ti --name inf-src-stx ${MIRROR_SRC_STX} sh
+        docker cp inf-src-stx:/stx-${STX_VER}.tar.bz2 ${MY_REPO_ROOT_DIR}
+        docker rm inf-src-stx
+
+        cd ${MY_REPO_ROOT_DIR}
+        tar xf stx-${STX_VER}.tar.bz2
+        mv stx-${STX_VER}/* stx-${STX_VER}/.repo .
+        rm -rf stx-${STX_VER} stx-${STX_VER}.tar.bz2
+    fi
 
     echo_step_end
 }
@@ -265,7 +272,7 @@ get_mirror_pkg () {
 
     docker pull ${MIRROR_CONTAINER_IMG}
     docker create -ti --name inf-centos-mirror ${MIRROR_CONTAINER_IMG} sh
-    docker cp inf-centos-mirror:/mirror_stx-${STX_VER} ${STX_MIRROR_DIR}
+    docker cp inf-centos-mirror:/mirror_stx-${STX_VER}/. ${STX_MIRROR_DIR}
     docker rm inf-centos-mirror
 
     echo_step_end
@@ -343,6 +350,7 @@ if [ "${USE_MIRROR}" == "Yes" ]; then
     get_mirror_pkg
 else
     repo_init_sync
+    get_mirror_pkg
 fi
 patch_src
 populate_dl