X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_inf_centos%2Fbuild_inf_centos.sh;h=cb34833dd161f4c9fcd53c27da699a5260990c91;hb=dad320fc8373acd5d00b240239c99626733c97a0;hp=6c373b0ead3e9d16a78ed4d71bb2bd7a49d8e481;hpb=11e81ff53949a6bfe2783c0b0495fc2abcf3da19;p=pti%2Frtp.git

diff --git a/scripts/build_inf_centos/build_inf_centos.sh b/scripts/build_inf_centos/build_inf_centos.sh
index 6c373b0..cb34833 100755
--- a/scripts/build_inf_centos/build_inf_centos.sh
+++ b/scripts/build_inf_centos/build_inf_centos.sh
@@ -124,6 +124,8 @@ STX_MANIFEST_URL="https://opendev.org/starlingx/manifest"
 
 SRC_META_PATCHES=${SCRIPTS_DIR}/meta-patches
 
+ISO_INF_COS=inf-image-centos-all-x86-64.iso
+
 prepare_workspace () {
     msg_step="Create workspace for the CentOS build"
     echo_step_start
@@ -268,28 +270,6 @@ populate_dl () {
     ${MY_REPO_ROOT_DIR}/stx-tools/toCOPY/populate_downloads.sh ${STX_MIRROR_DIR}/stx-6.0
 }
 
-# To be removed:
-# This build script can not successfully build out the image yet,
-# get the upstream image temporary so we can still test the CI job to
-# upload the image to nexus
-ISO_STX_COS=bootimage.iso
-ISO_UP_VER=6.0.0
-ISO_UP=http://mirror.starlingx.cengn.ca/mirror/starlingx/release/${ISO_UP_VER}/centos/flock/outputs/iso/${ISO_STX_COS}
-ISO_INF_COS=inf-image-centos-all-x86-64.iso
-
-build_image_rm () {
-    echo_step_start "Build CentOS images: To be removed"
-
-    mkdir -p ${STX_PRJ_OUTPUT}
-    cd ${STX_PRJ_OUTPUT}
-    wget -q ${ISO_UP} -O ${ISO_INF_COS}
-    ls -lh ${STX_PRJ_OUTPUT}/${ISO_INF_COS}
-
-    echo_step_end
-
-    echo_info "Build succeeded, you can get the image in ${STX_PRJ_OUTPUT}/${ISO_INF_COS}"
-}
-
 build_image () {
     echo_step_start "Build CentOS images"
 
@@ -298,6 +278,9 @@ build_image () {
     RUN_CMD="build-pkgs --build-avoidance"
     run_cmd "Build pkgs"
 
+    # The first run always fail
+    build-iso || sleep 60
+
     RUN_CMD="build-iso"
     run_cmd "Build ISO image"
 
@@ -317,5 +300,4 @@ create_env
 repo_init_sync
 patch_src
 populate_dl
-#build_image_rm
 build_image