build_inf_prepare_jenkins: fix the dir creation

Issue-ID: INF-274

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I0e7c89febc97b78cd5d5469149cc98ab8b3eba11

diff --git a/scripts/build_inf_centos/build_inf_centos.sh b/scripts/build_inf_centos/build_inf_centos.sh
index 14e70e5..45063f6 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_centos.sh
+++ b/scripts/build_inf_centos/build_inf_centos.sh
@@ -122,7 +122,7 @@ STX_MIRROR_DIR=${WORKSPACE}/mirror
 STX_MANIFEST_URL="https://opendev.org/starlingx/manifest"
 
 prepare_workspace () {
-    msg_step="Create workspace for the build"
+    msg_step="Create workspace for the CentOS build"
     echo_step_start
 
     mkdir -p ${STX_LOCAL_SRC_DIR} ${STX_LOCAL_PRJ_DIR} ${STX_MIRROR_DIR} ${STX_PRJ_OUTPUT}
@@ -139,7 +139,7 @@ prepare_workspace () {
 }
 
 create_env () {
-    msg_step="Create env file for the build"
+    msg_step="Create env file for the CentOS build"
     echo_step_start
 
     ENV_FILENAME=env.${PRJ_NAME}

diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
index f7a14b0..a1f9192 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
+++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
@@ -85,14 +85,16 @@ get_mirror () {
 #########################################################################
 # Main process
 #########################################################################
+msg_step="Prepare for jenkins build"
+
 set -x
 export BUILD_GROUP="jenkins"
 export WGET_OPENDEV="wget --no-check-certificate"
 export LOCALDISK="${WORKSPACE}/localdisk"
 export MIRROR_DIR="${WORKSPACE}/mirror"
 
-sudo mkdir -p ${LOCALDISK}/loadbuild/mock-cache
-sudo mkdir -p ${LOCALDISK}/loadbuild/mock
+mkdir -p ${LOCALDISK}/loadbuild/mock-cache
+mkdir -p ${LOCALDISK}/loadbuild/mock
 mkdir -p ${LOCALDISK}/designer
 mkdir -p ${LOCALDISK}/loadbuild
 
@@ -295,3 +297,5 @@ sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY*
 
 # Try to continue a yum command even if a StarlingX repo is unavailable.
 sudo yum-config-manager --setopt=StarlingX\*.skip_if_unavailable=1 --save
+
+echo_step_end

diff --git a/scripts/build_inf_yocto/build_inf_yocto.sh b/scripts/build_inf_yocto/build_inf_yocto.sh
index cdba10f..e28f6f7 100755 (executable)
--- a/scripts/build_inf_yocto/build_inf_yocto.sh
+++ b/scripts/build_inf_yocto/build_inf_yocto.sh
@@ -283,7 +283,7 @@ ISO_INF_ALIAS=${PRJ_OUTPUT_DIR}/inf-image-yocto-aio-${IMG_ARCH}.iso
 SSTATE_CONTAINER_IMG=infbuilder/inf-yocto-sstate:2022.05
 
 prepare_workspace () {
-    msg_step="Create workspace for the build"
+    msg_step="Create workspace for the Yocto build"
     echo_step_start
 
     mkdir -p ${PRJ_BUILD_DIR} ${SRC_ORAN_DIR} ${PRJ_BUILD_DIR_ANACONDA} \