From cd382eb0b2f175bc3701754f95201f6ea1512873 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 31 May 2022 10:11:59 +0800 Subject: [PATCH] build_inf_centos: remove the build_image_rm Issue-ID: INF-274 Signed-off-by: Jackie Huang Change-Id: I2e99bb46d59c026052d759b0847f740a21ed492b (cherry picked from commit dad320fc8373acd5d00b240239c99626733c97a0) --- scripts/build_inf_centos/build_inf_centos.sh | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/scripts/build_inf_centos/build_inf_centos.sh b/scripts/build_inf_centos/build_inf_centos.sh index 79f0810..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" @@ -320,5 +300,4 @@ create_env repo_init_sync patch_src populate_dl -#build_image_rm build_image -- 2.16.6