From 3e2f0ff9aa649a7f097a0f33858a92a7117801ba Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 16 Dec 2023 09:29:11 +1000 Subject: [PATCH 1/2] CI: Update RTD configuration file RTD has finished their switch requiring version 2 of their configuration file and we must now update to work with it. Ref: https://blog.readthedocs.com/use-build-os-config/ Change-Id: Idc473d791c02af1c054101675ef0011ec0b5a8ef Signed-off-by: Anil Belur --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 243587e..ee7629e 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,9 +9,9 @@ formats: - htmlzip build: - os: latest + os: "ubuntu-22.04" tools: - python: "3.7" + python: "3.11" python: install: -- 2.16.6 From c99cd24e81f9571f2d676a35dc181b445b65a22d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 14 May 2024 02:01:30 -0700 Subject: [PATCH 2/2] build_inf_debian: update to stx9.0 for J release Issue-ID: INF-456 Signed-off-by: Jackie Huang Change-Id: Ia13fef8234aff0ea47b0bd0eee123d60bd4dd8bc --- scripts/build_inf_debian/build_inf_debian.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/build_inf_debian/build_inf_debian.sh b/scripts/build_inf_debian/build_inf_debian.sh index 7aa8e1d..96c96ec 100755 --- a/scripts/build_inf_debian/build_inf_debian.sh +++ b/scripts/build_inf_debian/build_inf_debian.sh @@ -25,8 +25,8 @@ SRC_ORAN_BRANCH="master" SRC_ORAN_URL="https://gerrit.o-ran-sc.org/r/pti/rtp" -STX_VER="8.0" -ORAN_REL="ORAN H-Release (${STX_VER})" +STX_VER="9.0" +ORAN_REL="ORAN J-Release (${STX_VER})" SCRIPTS_DIR=$(dirname $(readlink -f $0)) SCRIPTS_NAME=$(basename $0) @@ -125,12 +125,11 @@ fi # "_" can't be used in project name PRJ_NAME=prj-oran-stx-deb -# stx 8.0 is not released yet -#STX_SRC_BRANCH="r/stx.${STX_VER}" +STX_SRC_BRANCH="r/stx.${STX_VER}" # Temporary for master -STX_TAG="master-1ba0db8" -STX_SRC_BRANCH="master" +#STX_TAG="master-1ba0db8" +#STX_SRC_BRANCH="master" STX_LOCAL_DIR=${WORKSPACE}/localdisk STX_LOCAL_SRC_DIR=${STX_LOCAL_DIR}/designer/${USER}/${PRJ_NAME} @@ -143,8 +142,8 @@ STX_APTLY_DIR=${WORKSPACE}/aptly STX_MINIKUBE_HOME=${WORKSPACE}/minikube_home STX_MANIFEST_URL="https://opendev.org/starlingx/manifest" -#MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_VER} -MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_TAG} +MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_VER} +#MIRROR_SRC_STX=infbuilder/inf-src-stx:${STX_TAG} MIRROR_CONTAINER_IMG=infbuilder/inf-debian-mirror:2022.11-stx-${STX_VER} MIRROR_APTLY_IMG=infbuilder/inf-debian-aptly:2022.11-stx-${STX_VER} -- 2.16.6