Merge "Revert "oran-shell-release: release image for F"" into f-release

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 56f33e8..b09ceda 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -7,7 +7,7 @@ Release-notes
 =============
 
 
-This document provides the release notes for 5.0.0 of RTP.
+This document provides the release notes for 6.0.0 of RTP.
 
 .. contents::
    :depth: 3
@@ -36,6 +36,33 @@ Version history
 | 2021-12-15         | 5.0.0              | Jackie Huang       | E Release          |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
+| 2022-06-15         | 6.0.0              | Jackie Huang       | F Release          |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+
+Version 6.0.0, 2022-06-15
+-------------------------
+- Sixth version (F release)
+- INF MultiOS support:
+
+  - Add support for CentOS as the base OS
+  - Two images will be provided:
+
+    - Yocto based image
+    - CentOS based image
+
+- Enable three deployment modes on Yocto based image:
+
+  - AIO simplex mode
+  - AIO duplex mode (2 servers with High Availabity)
+  - AIO duplex mode (2 servers with High Availabity) with additional worker node
+
+- Enable four deployment modes on CentOS based image:
+
+  - AIO simplex mode
+  - AIO duplex mode (2 servers with High Availabity)
+  - AIO duplex mode (2 servers with High Availabity) with additional worker node
+  - Distributed Cloud
 
 Version 5.0.0, 2021-12-15
 -------------------------

diff --git a/meta-stx-oran/conf/distro/poky-stx-oran.conf b/meta-stx-oran/conf/distro/poky-stx-oran.conf
index b02a1b5..dba3e0a 100644 (file)
--- a/meta-stx-oran/conf/distro/poky-stx-oran.conf
+++ b/meta-stx-oran/conf/distro/poky-stx-oran.conf
@@ -17,4 +17,4 @@ require conf/distro/poky-stx.conf
 
 MAINTAINER = "Jackie Huang <jackie.huang@windriver.com>"
 
-ORAN_REL = "E-Release (5.0)"
+ORAN_REL = "ORAN F-Release (6.0)"

diff --git a/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend
index 4904dfe..bec21c6 100644 (file)
--- a/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend
@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 do_install_append() {
-    sed -i -e 's/${STX_REL}/${ORAN_REL}/' ${D}${sysconfdir}/issue*
+    sed -i -e 's/\(${STX_REL}\)/\1 - ${ORAN_REL}/' ${D}${sysconfdir}/issue*
 }

diff --git a/scripts/build_inf_centos/build_inf_centos.sh b/scripts/build_inf_centos/build_inf_centos.sh
index 79f0810..aff1431 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_centos.sh
+++ b/scripts/build_inf_centos/build_inf_centos.sh
@@ -25,6 +25,8 @@ SRC_ORAN_BRANCH="master"
 
 SRC_ORAN_URL="https://gerrit.o-ran-sc.org/r/pti/rtp"
 
+ORAN_REL="ORAN F-Release (6.0)"
+
 SCRIPTS_DIR=$(dirname $(readlink -f $0))
 SCRIPTS_NAME=$(basename $0)
 TIMESTAMP=`date +"%Y%m%d_%H%M%S"`
@@ -124,6 +126,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
@@ -237,7 +241,12 @@ patch_src () {
     echo_step_start "Some source codes need to be patched for INF project"
 
     sed -i "s|/import/mirrors|${STX_MIRROR_DIR}|" \
-        $MY_REPO/stx/metal/installer/pxe-network-installer/centos/build_srpm.data
+        ${MY_REPO}/stx/metal/installer/pxe-network-installer/centos/build_srpm.data
+
+    grep -q "${ORAN_REL}" \
+        ${MY_REPO}/stx/config-files/centos-release-config/files/issue* \
+        || sed -i "s/\(@PLATFORM_RELEASE@\)/\1 - ${ORAN_REL}/" \
+        ${MY_REPO}/stx/config-files/centos-release-config/files/issue*
 
     # Apply meta patches
     cd ${SRC_META_PATCHES}
@@ -268,28 +277,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 +307,4 @@ create_env
 repo_init_sync
 patch_src
 populate_dl
-#build_image_rm
 build_image