set 1st active bwp in dlsim and ulsim

Signed-off-by: francescomani <email@francescomani.it>
improvements in check of BWP config file parameters in case of default 1st active full bwp
2026-07-13 20:50:28 +00:00 · 2026-05-30 10:03:34 +02:00 · 2026-05-30 10:03:34 +02:00 · 2026-05-30 10:03:34 +02:00 · 2026-05-30 10:03:33 +02:00 · 2026-05-30 10:03:33 +02:00
500 changed files with 8424 additions and 17820 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,4 +5,3 @@ common/utils/T/T_IDs.h
 common/utils/T/T_messages.txt.h
 common/utils/T/genids
 common/utils/T/genids.o
-build/
--- a/.github/workflows/jenkins-dispatch.yml
+++ b/.github/workflows/jenkins-dispatch.yml
@@ -1,190 +0,0 @@
-name: Duranta Jenkins Dispatch
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, labeled]
-    branches: [develop]
-  push:
-    branches:
-      - develop
-
-concurrency:
-  group: ${{ github.event_name }}-${{ github.event.action }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  verify-signed-commits:
-    runs-on: ubuntu-24.04
-
-    if: github.event_name == 'pull_request_target'
-
-    steps:
-      - name: Check all commits are signed
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          UNSIGNED=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/commits \
-            --paginate --jq '[.[] | select(.commit.verification.verified == false) | .sha[:7]] | join(", ")')
-
-          if [ -n "$UNSIGNED" ]; then
-            echo -e "$UNSIGNED commits are missing signature"
-            gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --body "$(cat <<EOF
-          **Validation:**
-          The following commit(s) are missing signature:
-
-          $UNSIGNED
-
-          Please use 'git commit -S' to sign your commits.
-          For detailed instructions, refer to the [CONTRIBUTING.md](https://github.com/duranta-project/openairinterface5g/blob/develop/CONTRIBUTING.md) file at the root of this repository or [GitHub Docs](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
-          EOF
-          )"
-            exit 1
-          fi
-
-  check-labels:
-    needs: verify-signed-commits
-    runs-on: ubuntu-24.04
-
-    if: github.event_name == 'pull_request_target'
-
-    steps:
-      - name: Check for mandatory CI label
-        run: |
-          PR_LABELS=$(echo '${{ toJson(github.event.pull_request.labels) }}' | jq -r '.[].name')
-
-          for label in \
-            "${{ vars.BUILD_ONLY_LABEL }}" \
-            "${{ vars.DOC_LABEL }}" \
-            "${{ vars.NR_LABEL }}" \
-            "${{ vars.NRUE_LABEL }}" \
-            "${{ vars.LTE_LABEL }}" \
-            "${{ vars.CI_LABEL }}" \
-            "${{ vars.RETRIGGER_CI_LABEL }}"; do
-            if echo "$PR_LABELS" | grep -qxF "$label"; then
-              exit 0
-            fi
-          done
-
-          exit 1
-
-  detect-changes:
-    needs: check-labels
-    runs-on: ubuntu-24.04
-
-    if: |
-      always() && (
-        github.event_name == 'push' ||
-        needs.check-labels.result == 'success'
-      ) && (
-        github.event.action != 'labeled' ||
-        github.event.label.name == vars.RETRIGGER_CI_LABEL
-      )
-
-    outputs:
-      protected_files_changed: ${{ steps.filter.outputs.protected }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Check changed files
-        uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            protected:
-              - 'ci-scripts/**'
-              - '.github/workflows/**'
-              - '.github/actions/**'
-              - 'docker/**'
-              - 'charts/**'
-              - 'openshift/**'
-              - 'cmake_targets/build_oai'
-              - 'cmake_targets/tools/build_helper'
-
-  require-maintainer-approval:
-    needs: detect-changes
-
-    if: |
-      always() &&
-      needs.detect-changes.outputs.protected_files_changed == 'true'
-    runs-on: ubuntu-24.04
-
-    environment:
-      name: ci-approval
-
-    steps:
-      - run: echo "Maintainer has approved the changes"
-
-  trigger-jenkins:
-    needs:
-      - check-labels
-      - detect-changes
-      - require-maintainer-approval
-
-    if: |
-      always() &&
-      (
-        needs.detect-changes.outputs.protected_files_changed == 'false' ||
-        needs.require-maintainer-approval.result == 'success'
-      )
-
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Trigger Jenkins
-        run: |
-          # Write payload to a temp file to avoid shell escaping issues
-          cat << 'EOF' > /tmp/payload.json
-          ${{ toJson(github.event) }}
-          EOF
-
-          # Filter and send
-          jq -c 'del(.pull_request.body)' /tmp/payload.json > /tmp/filtered_payload.json
-
-          # Remap pull_request_target -> pull_request for Jenkins compatibility
-          EVENT_NAME="${{ github.event_name }}"
-          if [ "$EVENT_NAME" = "pull_request_target" ]; then
-            EVENT_NAME="pull_request"
-          fi
-
-          curl -X POST "https://${{ secrets.J_USER }}:${{ secrets.J_PASS }}@${{ secrets.J_URL }}" \
-            -H "Accept: */*" \
-            -H "Content-Type: application/json" \
-            -H "User-Agent: GitHub-Hookshot/${{ secrets.H_AGENT }}" \
-            -H "X-Github-Delivery: ${{ secrets.GITHUB_TOKEN }}" \
-            -H "X-Github-Event: $EVENT_NAME" \
-            -H "X-Github-Hook-Id: ${{ secrets.H_ID }}" \
-            -H "X-Github-Hook-Installation-Target-Id: ${{ secrets.H_TARGET }}" \
-            -H "X-Github-Hook-Installation-Target-Type: repository" \
-            --data @/tmp/filtered_payload.json
-
-  cleanup:
-    needs:
-      - verify-signed-commits
-      - check-labels
-      - detect-changes
-      - require-maintainer-approval
-      - trigger-jenkins
-
-    if: always() && github.event_name == 'pull_request_target'
-
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Remove retrigger-ci label
-        run: |
-          PR_LABELS=$(echo '${{ toJson(github.event.pull_request.labels) }}' | jq -r '.[].name')
-          if echo "$PR_LABELS" | grep -qxF "${{ vars.RETRIGGER_CI_LABEL }}"; then
-            gh pr edit ${{ github.event.pull_request.number }} --remove-label "${{ vars.RETRIGGER_CI_LABEL }}" --repo ${{ github.repository }}
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@

 # RELEASE NOTES: #

-## [v2.4.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.4.0) -> December 2025. ##
+## [v2.4.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.4.0) -> December 2025. ##

 General new features and improvements (both RAN and UE):
 - Rework LDPC BBdev/AAL interface and support both AMD T2/Intel vRAN Boost
@@ -68,7 +68,7 @@ Configuration file changes:
  should be removed
 - `MACRLCs.[0].stats_max_ue` has been added

-## [v2.3.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.3.0) -> July 2025. ##
+## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##

 General new features and improvements (both RAN and UE):
 - Preliminary support for RedCap UEs
@@ -114,7 +114,7 @@ nrUE changes:
 Regression:
 - Multiple BWPs do not work reliably on gNB; use tag 2025.w17

-## [v2.2.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.2.0) -> November 2024. ##
+## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##

 General 5G improvements (both gNB and UE):
 - Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
@@ -170,7 +170,7 @@ General 5G improvements (both gNB and UE):
 This release also includes many fixes and documentation updates. See
 `doc/README.md` in the repository for an overview of documentation.

-## [v2.1.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.1.0) -> February 2024. ##
+## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##

 This release improves existing 5G support and adds various new features.

@@ -197,7 +197,7 @@ interoperability is under testing.

 This release also includes many fixes and documentation updates.

-## [v2.0.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.0.0) -> August 2023. ##
+## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##

 This release adds support for 5G and maintains previous features:
 * 5G SA in gNB
@@ -226,11 +226,11 @@ This release adds support for 5G and maintains previous features:

 For more information on supported features, please refer to the [feature set](doc/FEATURE_SET.md).

-## [v1.2.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.2.1) -> February 2020. ##
+## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##

 * Bug fix for mutex lock for wake-up signal

-## [v1.2.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.2.0) -> January 2020. ##
+## [v1.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.0) -> January 2020. ##

 This version adds the following implemented features:

@@ -246,11 +246,11 @@ This version also has an improved code quality:
 * Better Test Coverage in Continuous Integration:
  - Initial framework to do long-run testing at R2LAB

-## [v1.1.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.1.1) -> November 2019. ##
+## [v1.1.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.1) -> November 2019. ##

 - Bug fix in the TDD Fair Round-Robin scheduler

-## [v1.1.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.1.0) -> July 2019. ##
+## [v1.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.0) -> July 2019. ##

 This version adds the following implemented features:

@@ -282,19 +282,19 @@ This version has an improved code quality:
  - Multi-RRU TDD mode
  - X2 Handover in FDD mode

-## [v1.0.3](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.3) -> June 2019. ##
+## [v1.0.3](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.3) -> June 2019. ##

 - Bug fix for LimeSuite v19.04.0 API

-## [v1.0.2](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.2) -> February 2019. ##
+## [v1.0.2](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.2) -> February 2019. ##

 - Full OAI support for 3.13.1 UHD

-## [v1.0.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.1) -> February 2019. ##
+## [v1.0.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.1) -> February 2019. ##

 - Bug fix for the UE L1 simulator.

-## [v1.0.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.0) -> January 2019. ##
+## [v1.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.0) -> January 2019. ##

 This version first implements the architectural split described in the following picture.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,12 +383,6 @@ endif()
 add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
 add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)

-#########################
-##### E3 AGENT
-#########################
-set(E3_AGENT "OFF" CACHE STRING "O-RAN nGRG E3 Agent for dApps")
-set_property(CACHE E3_AGENT PROPERTY STRINGS "ON" "OFF")
-
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -861,6 +855,7 @@ set(NR_PHY_SRC_RU
  ${OPENAIR1_DIR}/PHY/MODULATION/nr_beamforming.c
  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ru.c
+  ${OPENAIR1_DIR}/PHY/if4_tools.c
  )

 set(PHY_SRC_UE
@@ -929,6 +924,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
@@ -1211,7 +1207,6 @@ set (MAC_NR_SRC
  ${NR_GNB_MAC_DIR}/gNB_scheduler_uci.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_srs.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_RA.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_pcch.c
  ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
@@ -1774,25 +1769,23 @@ target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
                      asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
+# nr RRU
+add_executable(nr-oru
+  ${OPENAIR_DIR}/executables/nr-ru.c
+  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_ru_procedures.c
+  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR_DIR}/executables/main_nr_ru.c
+)
+target_link_libraries(nr-oru PRIVATE
+  UTIL NR_PHY_RU PHY_NR shlib_loader dl
+  radio_common softmodem_common nfapi_pnf_lib)
+target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
+  barrier actor nfapi_user_lib)
+target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)

-if (OAI_RU_FRONTHAUL)
-  add_executable(nr-oru
-    ${OPENAIR_DIR}/executables/nr-ru.c
-    ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/nr_ru_procedures.c
-    ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-    ${OPENAIR_DIR}/executables/main_nr_ru.c
-    ${OPENAIR_DIR}/executables/nr-oru.c
-  )
-  target_link_libraries(nr-oru PRIVATE
-    UTIL NR_PHY_RU PHY_NR shlib_loader dl oru_fh MAC_NR_COMMON
-    radio_common softmodem_common nfapi_pnf_lib)
-  target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-    barrier actor nfapi_user_lib)
-  target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-endif()
 # nr-softmodem
 ###################################################

@@ -1837,11 +1830,6 @@ if(E2_AGENT)
  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

-if (E3_AGENT)
-    target_link_libraries(nr-softmodem PRIVATE e3ap)
-    target_compile_definitions(nr-softmodem PRIVATE E3_AGENT)
-endif()
-

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,47 +1,68 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->

-# Contributing to Duranta
+# Contributing to OpenAirInterface

 We want to make contributing to this project as easy and transparent as possible.

-1. Create an account on [GitHub](https://github.com/). Only contributions
-   against [`duranta-project/openairinterface5g/`](https://github.com/duranta-project/openairinterface5g/)
-   are accepted.
-2. Fork the repository, and open pull requests for your contributions from your
-   fork.
-3. The contributing policies are described in the [corresponding documentation
+Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).
+
+1. Sign and return a Contributor License Agreement to OAI team.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
+   if you do not have any.
+   - We recommend that you register with a professional or student email address.
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us
+     (mailto:oaicicdteam@openairinterface.org).
+   - Eurecom GitLab does NOT accept public email domains.
+3. Provide the OAI team with the **username** of this account to
+   (mailto:oaicicdteam@openairinterface.org) ; we will give you the developer
+   rights on this repository.
+4. The contributing policies are described in the [corresponding documentation
   page](doc/code-style-contrib.md).
-4. [Sign the CLA](https://github.com/duranta-project/governance/blob/main/docs/easy_cla_process.md)
-   either before doing making your first pull request or after submitting the
-   pull request.
+   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account.
+     It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge
+     request from a forked repository.
+      * This decision was made for the license reasons.
+      * The Continuous Integration will reject your merge request.
 5. Mandatory signing of all the commits using the email address used for CLA.

 ## Commit Guidelines

-Every pull request must pass two CI checks before it can be merged:
-
-1. **[Developer Certificate of Origin (DCO)](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin)**:
-   Each commit must include a `Signed-off-by:` trailer in the commit message.
-   Use `git commit -s` (or `--signoff`).
-
-2. **[Verified commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)**:
-   Each commit must be cryptographically signed using SSH or GPG keys to confirm
-   its origin.
-
 ### Signing Commits

-GitHub supports commit signing using either SSH keys or GPG keys. For the
-step-by-step setup (key generation, Git configuration, registering the key on
-GitHub, and verifying signatures locally), see the
-[commit signing section of the Git guide](doc/git-guide.md#setting-up-commit-signing).
+To sign commits:
+
+You can also get the verified label
+on your commits via using [SSH KEYS or GPG KEYS](https://docs.gitlab.com/user/project/repository/signed_commits/)
+
+```
+# Edit .git/config in the git repository you are working on
+# Add the user section
+[user]
+    name = YOUR NAME
+    email = YOUR EMAIL ADDRESS
+
+# If you use a signing key, use the below configuration instead
+[user]
+    name = YOUR NAME
+    email = YOUR EMAIL ADDRESS
+    signingkey = LOCATION OF SSH KEYS or GPG KEY
+
+[gpg]
+    format = ssh
+
+[commit]
+    gpgsign = true
+```
+
+> **NOTE:** If your commits are not signed the CI framework will not accept the MR.

-> **NOTE:** If your commits are not signed, the CI framework will not accept the PR.
 For more information regarding contribution guidelines
 please check [this document](doc/code-style-contrib.md)

 ## License

-By contributing to Duranta, you agree that your contributions will be
+By contributing to OpenAirInterface, you agree that your contributions will be
 licensed under

 1. [CSSL v1.0 license](LICENSES/preferred/CSSL-v1.0.txt): for RAN and UE
--- a/README.md
+++ b/README.md
@@ -1,21 +1,25 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->

 <h1 align="center">
-    <a href="https://lfnetworking.org/projects/duranta/"><img src="https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png" alt="Duranta OAI" width="550"></a>
+    <a href="https://openairinterface.org/"><img src="https://openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png" alt="OAI" width="550"></a>
 </h1>

 <p align="center">
-    <a href="https://github.com/duranta-project/openairinterface5g/blob/develop/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></a>
+    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></a>
    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
    <a href="https://releases.ubuntu.com/26.04/"><img src="https://img.shields.io/badge/OS-Ubuntu26-Green" alt="Supported OS Ubuntu 26"></a>
    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RHEL9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedora44-Green" alt="Supported OS Fedora 44"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore44-Green" alt="Supported OS Fedora 44"></a>
 </p>

 <p align="center">
-    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu-Image-Builder%2F&label=build-Ubuntu-x86%20Images"></a>
-    <a href="https://jenkins-oai.eurecom.fr/job/RAN-RHEL-Cluster-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-RHEL-Cluster-Image-Builder%2F&label=build-RHEL-Cluster%20Images"></a>
+    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/releases"><img alt="GitLab Release (custom instance)" src="https://img.shields.io/gitlab/v/release/oai/openairinterface5g?gitlab_url=https%3A%2F%2Fgitlab.eurecom.fr&include_prereleases&sort=semver"></a>
+</p>
+
+<p align="center">
+    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu18-Image-Builder%2F&label=build-Ubuntu-x86%20Images"></a>
+    <a href="https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-RHEL8-Cluster-Image-Builder%2F&label=build-UBI-x86%20Images"></a>
    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-ARM-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu-ARM-Image-Builder%2F&label=build-Ubuntu-ARM%20Images"></a>
 </p>

@@ -27,23 +31,14 @@
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>

-# Duranta - OpenAirInterface
-
-Duranta OpenAirInterface RAN delivers and maintains an open-source cellular
-wireless software stack for 4G, 5G and future networking technologies. It
-supports simulation, prototyping, and end-to-end deployments on
-Commercial-Off-The-Shelf (COTS) hardware. Built for research and
-experimentation, it provides standard-compliant interfaces and is released
-under the Collaborative Standards Software License (CSSL).
-
-## License
+# OpenAirInterface License #

 *  [OAI License Model](http://www.openairinterface.org/?page_id=101)
 *  [CSSL v1.0](http://www.openairinterface.org/?page_id=698)

 The source code is distributed under [**CSSL v1.0**](LICENSE).
 Some files, such as for orchestration, are distributed under
-[MIT license](./LICENSES/preferred/MIT.txt). Documentation is distributed under
+[MIT license](preferred)(MIT.txt). Documentation is distributed under
 [Creative Commons Attribution 4.0 International license](LICENSES/preferred/CC-BY-4.0.txt).

 All the files without an explicit copyright header have an implicit "Copyright
@@ -59,7 +54,7 @@ history:
 3. OAI Public License v1.0: starting tag v.04 till v1.0
 4. GPL 3: starting tag v.0 till v.04 (only initial implementation of 4G)

-## Where to Start
+# Where to Start #

 *  [General overview of documentation](./doc/README.md)
 *  [The implemented features](./doc/FEATURE_SET.md)
@@ -75,7 +70,7 @@ To find all READMEs, this command might be handy:
 find . -iname "readme*"
 ```

-## RAN repository structure
+# RAN repository structure #

 The OpenAirInterface (OAI) software is composed of the following parts: 

@@ -100,9 +95,9 @@ openairinterface5g
 └── tools             : Tools for use by the developers/ci machines: code analysis and formatting
 ```

-## How to get support from the Community
+# How to get support from the OAI Community # 

-You can ask your question on the [mailing lists](https://github.com/duranta-project/openairinterface5g/wiki/MailingList).
+You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).

 Your email should contain below information:

@@ -113,6 +108,6 @@ Your email should contain below information:
 - OAI gNB/DU/CU/CU-CP/CU-UP configuration file in `.conf` format only.
 - Logs of OAI gNB/DU/CU/CU-CP/CU-UP in `.log` or `.txt` format only.
 - In case your question is related to performance, include a small description of the machine (Operating System, Kernel version, CPU, RAM and networking card) and diagram of your testing environment.
- Known/open issues are present on [Github](https://github.com/duranta-project/openairinterface5g/issues), so keep checking.
+- Known/open issues are present on [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.

 Always remember a structured email will help us understand your issues quickly.
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,61 +0,0 @@
-# Duranta-OpenAirInterface Roadmap
-
-## RAN Roadmap
-
-### Q2 2026
-
- GPU LDPC Accelerator
- NR-DC Support
- CN Paging procedures
- Support for 64 UEs with E2E throughput validation
- Basic Cat-A OAI O-RU (simulated radio)
-
-### Q3 2026
-
- QoS-enforcing scheduler
- Xn Handover Support
- UL MU-MIMO
- Aperiodic UL channels (SRS/CSI reporting)
- NR user plane protocol
- Multi-cell support in L2
- Support for 128 UEs with E2E throughput validation
-
-### Q4 2026
-
- Cat-B Support for FHI 7.2 at RU/DU
- RAN Paging
- Support of 5G RAN Slicing
- Multi-cell performance evaluation (with at-least 3 cells)
-
-### Q1 2027
-
- Digital Beamforming Support
- DL MU-MIMO at L1
-
---
-
-## UE Roadmap
-
-### Q2 2026
-
- Support for Handover Procedures
- Basic Sidelink Procedures (PSSCH, PSCCH)
- PUCCH formats 1&3
-
-### Q3 2026
-
- Support for 2 UL layers
- Support for 2 DL layers
- RU sharing
-
-### Q4 2026
-
- Reduce feedback time
- AT command interface
- DL KPI Improvements
- UL KPI Improvements
-
-### Q1 2027
-
- Scan carrier
- Power control procedures for outdoor operation
--- a/charts/physims-4g/Chart.yaml
+++ b/charts/physims-4g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm chart for physical simulators network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -31,8 +31,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-4g/charts/physims.4g/Chart.yaml
+++ b/charts/physims-4g/charts/physims.4g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm subchart for 4G physims network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -30,8 +30,8 @@ keywords:
  - 4G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-5g/Chart.yaml
+++ b/charts/physims-5g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm chart for physical simulators network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -31,8 +31,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-5g/charts/physims.5g/Chart.yaml
+++ b/charts/physims-5g/charts/physims.5g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm subchart for 5G physims network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -30,8 +30,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -3,12 +3,6 @@
 * SPDX-License-Identifier: LicenseRef-CSSL-1.0
 */

-import groovy.transform.Field
-
-@Field def branch = ''
-@Field def gitLocalBranch = ''
-@Field def downstreamResults = [:]
-
 // Location of the executor node
 def nodeExecutor = params.nodeExecutor

@@ -18,43 +12,13 @@ def do4Gtest = false
 def do5Gtest = false
 def do5GUeTest = false

+//
+def gitCommitAuthorEmailAddr
+
 // list of failing stages
 def failingStages = ""
-def mrValidationWarning = ""

-// Globally scoped status result variables for downstream jobs.
-def ubuntuBuildStatus = ''
-def ubuntuArmBuildStatus = ''
-def ubuntuJetsonBuildStatus = ''
-def rhelBuildStatus = ''
-def armBuildStatus = ''
-
-def physim5GStatus = ''
-def physimGH5GStatus = ''
-def channelSimStatus = ''
-def vrtSim5GStatus = ''
-def rfSim5GStatus = ''
-def flexricRAN5GStatus = ''
-
-def physim4GStatus = ''
-def rfSim4GStatus = ''
-def l2Sim4GStatus = ''
-def lteTDDB200Status = ''
-def lteFDDB200OAIUEStatus = ''
-def lteFDDB200Status = ''
-def lteTDD2x2N3xxStatus = ''
-
-def nsaTDDB200Status = ''
-def saTDDB200Status = ''
-def phytestLDPCoffloadStatus = ''
-def saAW2SStatus = ''
-def saAERIALStatus = ''
-def saMultiAntennaStatus = ''
-def saFHI72Status = ''
-def saFHI72MplaneStatus = ''
-def saHandoverStatus = ''
-def saAERIALOAIUEStatus = ''
-def saOAIUEStatus = ''
+OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"

 pipeline {
  agent {
@@ -62,100 +26,77 @@ pipeline {
  }
  options {
    timestamps()
+    gitLabConnection('OAI GitLab')
    ansiColor('xterm')
  }

  stages {
-    stage ("Get Parameters") {
+    stage ("Verify Parameters") {
      steps {
        script {
-          echo '\u2705 \u001B[32mGet Parameters\u001B[0m'
-          // GIT_BRANCH is prefixed with "origin/" by Jenkins - stripped version for use in tags and params in case of PUSH event
-          gitLocalBranch = env.GIT_BRANCH.replace('origin/', '')
-          if (env.GITHUB_PR_NUMBER) {
-            echo "PR number           :   ${env.GITHUB_PR_NUMBER}"
-            echo "Source Repository   :   ${env.GITHUB_PR_URL}"
-            echo "Source Branch       :   ${env.GITHUB_PR_SOURCE_BRANCH}"
-            echo "Commit ID           :   ${env.GITHUB_PR_HEAD_SHA}"
-            echo "Target Repo         :   ${env.GIT_URL}"
-            echo "Target Branch       :   ${env.GITHUB_PR_TARGET_BRANCH}"
-            echo "Label               :   ${env.GITHUB_PR_LABELS}"
-            branch = "${env.GITHUB_PR_SOURCE_BRANCH.replace('/', '-').replace('+', '-')}-${env.GITHUB_PR_HEAD_SHA}"
-          } else {
-            echo "Branch              :   ${gitLocalBranch}"
-            echo "Commit ID           :   ${env.GIT_COMMIT}"
-            branch = "${gitLocalBranch}-${env.GIT_COMMIT}"
-          }
          env.JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
-        }
-      }
-    }
-    stage ("Verify Labels") {
-      steps {
-        echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
-        script {
-          if (env.GITHUB_PR_NUMBER) {
-            if (!(env.GITHUB_PR_LABELS)) {
-              def gitBaseUrl = env.GIT_URL.trim().replace('.git', '')
-              def message = "**CI Build:** [#${env.BUILD_NUMBER}](${BUILD_URL}) | Not performing CI due to the absence of one of the following mandatory labels:\n"
-              message += "- ${gitBaseUrl}/labels/documentation (don't perform any stages)\n"
-              message += "- ${gitBaseUrl}/labels/BUILD-ONLY (execute only build stages)\n"
-              message += "- ${gitBaseUrl}/labels/4G-LTE (perform 4G tests)\n"
-              message += "- ${gitBaseUrl}/labels/5G-NR (perform 5G tests)\n"
-              message += "- ${gitBaseUrl}/labels/nrUE (perform only 5G-UE related tests including physims excluding LDPC tests)\n"
-              message += "- ${gitBaseUrl}/labels/CI (perform both 4G and 5G tests)\n"
-              githubPRComment comment: githubPRMessage(message)
-              error('Not performing CI due to lack of mandatory labels')
-            }
-            if (env.GITHUB_PR_LABELS.contains('CI')) {
+          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
+          def allParametersPresent = true
+
+          echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
+          if ("MERGE".equals(env.gitlabActionType)) {
+            LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid
+            LABEL_CHECK = LABEL_CHECK.trim()
+            if (LABEL_CHECK == 'NONE') {
+              def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request should have one of the mandatory labels:\n\n"
+              message += " - ~documentation (don't perform any stages)\n"
+              message += " - ~BUILD-ONLY (execute only build stages)\n"
+              message += " - ~4G-LTE (perform 4G tests)\n"
+              message += " - ~5G-NR (perform 5G tests)\n"
+              message += " - ~CI (perform both 4G and 5G tests)\n"
+              message += " - ~nrUE (perform only 5G-UE related tests including physims excluding LDPC tests)\n\n"
+              message += "Not performing CI due to lack of labels"
+              addGitLabMRComment comment: message
+              error('Not performing CI due to lack of labels')
+            } else if (LABEL_CHECK == 'FULL') {
              do4Gtest = true
              do5Gtest = true
              do5GUeTest = true
-            }
-            if (env.GITHUB_PR_LABELS.contains('4G-LTE')) {
+            } else if (LABEL_CHECK == "SHORTEN-4G") {
              do4Gtest = true
-            }
-            if (env.GITHUB_PR_LABELS.contains('5G-NR')) {
+            } else if (LABEL_CHECK == 'SHORTEN-5G') {
              do5Gtest = true
-            }
-            if (env.GITHUB_PR_LABELS.contains('nrUE')) {
+            } else if (LABEL_CHECK == 'SHORTEN-5G-UE') {
              do5GUeTest = true
-            }
-            if (env.GITHUB_PR_LABELS.contains('documentation')) {
+            } else if (LABEL_CHECK == 'SHORTEN-4G-5G-UE') {
+              do4Gtest = true
+              do5GUeTest = true
+            } else if (LABEL_CHECK == 'documentation') {
              doBuild = false
+            } else {
+              // is "BUILD-ONLY", will only build
            }
          } else {
-            // PUSH event
            do4Gtest = true
            do5Gtest = true
          }
-          echo """
-            CI decision summary:
-            doBuild     = ${doBuild}
-            do4Gtest    = ${do4Gtest}
-            do5Gtest    = ${do5Gtest}
-            do5GUeTest  = ${do5GUeTest}
-          """
        }
      }
    }
    stage ("Verify Guidelines") {
      steps {
-        echo "Git URL          is ${GIT_URL}"
-        echo "Job Name         is ${JOB_NAME}"
-        echo "Build Id         is ${BUILD_ID}"
+        echo "Git URL     is ${GIT_URL}"
+        echo "GitLab Act    is ${env.gitlabActionType}"
        script {
-          if (env.GITHUB_PR_NUMBER) {
+          if ("MERGE".equals(env.gitlabActionType)) {
+            // since a bit, in push events, gitlabUserEmail is not populated
+            gitCommitAuthorEmailAddr = env.gitlabUserEmail
+            echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
            // Validate MR commits: checks for missing Signed-off-by and merge commits
            def mrValidationLog = "signedCommit_${env.BUILD_NUMBER}.log"
            def mrValidationExitCode = sh(
-                script: "bash ./ci-scripts/pre-ci-check.sh -s ${env.GITHUB_PR_HEAD_SHA} -t origin/${env.GITHUB_PR_TARGET_BRANCH} > ${mrValidationLog} 2>&1",
+                script: "bash ./ci-scripts/pre-ci-check.sh -s origin/${env.gitlabSourceBranch} -t origin/${env.gitlabTargetBranch} > ${mrValidationLog} 2>&1",
                returnStatus: true
            )
            def mrValidationMessage = readFile(mrValidationLog).trim()
            sh "rm -f ${mrValidationLog}"
            if (mrValidationExitCode >= 1) {
-              mrValidationWarning = mrValidationMessage
+              addGitLabMRComment comment: "${mrValidationMessage}"
            }
            if (mrValidationExitCode >= 2) {
              error("${mrValidationMessage}")
@@ -163,21 +104,26 @@ pipeline {
          } else {
            echo "Git Branch    is ${GIT_BRANCH}"
            echo "Git Commit    is ${GIT_COMMIT}"
+            // since a bit, in push events, gitlabUserEmail is not populated
+            gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
+            gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
+            echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
          }
        }
      }
    }
-    stage ("Internal-Repo-Push") {
+    stage ("Local-Repo-Push") {
      steps {
        script {
-          triggerDownstreamJob ('RAN-Internal-Repo-Push')
+          triggerDownstreamJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
        }
      }
      post {
        failure {
          script {
+            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Cannot perform CI - merge validation failed (merge conflict, git operation failure, or internal CI error)."
+            addGitLabMRComment comment: message
            currentBuild.result = 'FAILURE'
-            failingStages += '\n * Internal-Repo-Push - merge validation failed (merge conflict, git operation failure, or internal CI error)'
          }
        }
      }
@@ -189,7 +135,7 @@ pipeline {
        stage ("Ubuntu-Image-Builder") {
          steps {
            script {
-              triggerDownstreamJob ('RAN-Ubuntu-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
            }
          }
          post {
@@ -197,7 +143,7 @@ pipeline {
              script {
                // Using a unique variable name for each test stage to avoid overwriting on a global variable
                // due to parallel-time concurrency
-                ubuntuBuildStatus = finalizeDownstreamJob('RAN-Ubuntu-Image-Builder')
+                ubuntuBuildStatus = finalizeDownstreamJob('RAN-Ubuntu18-Image-Builder')
              }
            }
            failure {
@@ -211,7 +157,7 @@ pipeline {
        stage ("Ubuntu-ARM-Image-Builder") {
          steps {
            script {
-              triggerDownstreamJob ('RAN-Ubuntu-ARM-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
            }
          }
          post {
@@ -233,7 +179,7 @@ pipeline {
        stage ("Ubuntu-Jetson-Image-Builder") {
          steps {
            script {
-              triggerDownstreamJob ('RAN-Ubuntu-Jetson-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-Image-Builder')
            }
          }
          post {
@@ -255,7 +201,7 @@ pipeline {
        stage ("RHEL-Cluster-Image-Builder") {
          steps {
            script {
-              triggerDownstreamJob ('RAN-RHEL-Cluster-Image-Builder')
+              triggerDownstreamJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
            }
          }
          post {
@@ -263,7 +209,7 @@ pipeline {
              script {
                // Using a unique variable name for each test stage to avoid overwriting on a global variable
                // due to parallel-time concurrency
-                rhelBuildStatus = finalizeDownstreamJob('RAN-RHEL-Cluster-Image-Builder')
+                rhelBuildStatus = finalizeDownstreamJob('RAN-RHEL8-Cluster-Image-Builder')
              }
            }
            failure {
@@ -277,7 +223,7 @@ pipeline {
        stage ("ARM-Cross-Compile") {
          steps {
            script {
-              triggerDownstreamJob ('RAN-ARM-Cross-Compile-Builder')
+              triggerDownstreamJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
            }
          }
          post {
@@ -299,11 +245,11 @@ pipeline {
      }
    }
    stage ("DockerHub-Push") {
-      when { expression {doBuild && !(env.GITHUB_PR_NUMBER)} }
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
      steps {
        script {
          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerDownstreamJob ('RAN-DockerHub-Push')
+            triggerDownstreamJob ('RAN-DockerHub-Push', 'DockerHub-Push')
          }
        }
      }
@@ -323,7 +269,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-PhySim-Cluster-5G')
+              triggerDownstreamJob ('RAN-PhySim-Cluster-5G', 'PhySim-Cluster-5G')
            }
          }
          post {
@@ -346,7 +292,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-PhySim-GraceHopper-5G')
+              triggerDownstreamJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
            }
          }
          post {
@@ -369,7 +315,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-Channel-Simulation')
+              triggerDownstreamJob ('RAN-Channel-Simulation', 'Channel-Simulation')
            }
          }
          post {
@@ -392,7 +338,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-PhySim-Cluster-4G')
+              triggerDownstreamJob ('RAN-PhySim-Cluster-4G', 'PhySim-Cluster-4G')
            }
          }
          post {
@@ -415,7 +361,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-RF-Sim-Test-4G')
+              triggerDownstreamJob ('RAN-RF-Sim-Test-4G', 'RF-Sim-Test-4G')
            }
          }
          post {
@@ -438,7 +384,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-VRT-Sim-Test-5G')
+              triggerDownstreamJob ('RAN-VRT-Sim-Test-5G', 'VRT-Sim-Test-5G')
            }
          }
          post {
@@ -461,7 +407,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-RF-Sim-Test-5G')
+              triggerDownstreamJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
            }
          }
          post {
@@ -484,7 +430,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('OAI-FLEXRIC-RAN-Integration-Test')
+              triggerDownstreamJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
            }
          }
          post {
@@ -507,7 +453,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-L2-Sim-Test-4G')
+              triggerDownstreamJob ('RAN-L2-Sim-Test-4G', 'L2-Sim-Test-4G')
            }
          }
          post {
@@ -530,7 +476,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-LTE-FDD-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-FDD-LTEBOX-Container')
            }
          }
          post {
@@ -538,13 +484,13 @@ pipeline {
              script {
                // Using a unique variable name for each test stage to avoid overwriting on a global variable
                // due to parallel-time concurrency
-                lteFDDB200Status = finalizeDownstreamJob('RAN-LTE-FDD-LTEBOX-Container')
+                lteTDDB200Status = finalizeDownstreamJob('RAN-LTE-FDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200Status
+                failingStages += lteTDDB200Status
              }
            }
          }
@@ -554,7 +500,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
+              triggerDownstreamJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container', 'LTE-FDD-OAIUE-OAICN4G-Container')
            }
          }
          post {
@@ -577,7 +523,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-LTE-TDD-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-TDD-LTEBOX-Container')
            }
          }
          post {
@@ -585,13 +531,13 @@ pipeline {
              script {
                // Using a unique variable name for each test stage to avoid overwriting on a global variable
                // due to parallel-time concurrency
-                lteTDDB200Status = finalizeDownstreamJob('RAN-LTE-TDD-LTEBOX-Container')
+                lteFDDB200Status = finalizeDownstreamJob('RAN-LTE-TDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteTDDB200Status
+                failingStages += lteFDDB200Status
              }
            }
          }
@@ -600,7 +546,7 @@ pipeline {
          when { expression {do4Gtest || do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-NSA-B200-Module-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'NSA-B200-Module-LTEBOX-Container')
            }
          }
          post {
@@ -623,7 +569,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-B200-Module-SABOX-Container')
+              triggerDownstreamJob ('RAN-SA-B200-Module-SABOX-Container', 'SA-B200-Module-SABOX-Container')
            }
          }
          post {
@@ -646,7 +592,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-gNB-N300-Timing-Phytest-LDPC')
+              triggerDownstreamJob ('RAN-gNB-N300-Timing-Phytest-LDPC', 'gNB-N300-Timing-Phytest-LDPC')
            }
          }
          post {
@@ -669,7 +615,7 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-LTE-TDD-2x2-Container')
+              triggerDownstreamJob ('RAN-LTE-TDD-2x2-Container', 'LTE-TDD-2x2-Container')
            }
          }
          post {
@@ -692,7 +638,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-AW2S-CN5G')
+              triggerDownstreamJob ('RAN-SA-AW2S-CN5G', 'SA-AW2S-CN5G')
            }
          }
          post {
@@ -711,11 +657,34 @@ pipeline {
            }
          }
        }
+        stage ("Sanity-Check OAI-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerCN5GDownstreamJob ('OAI-CN5G-COTS-UE-Test', 'OAI-CN5G-COTS-UE-Test')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                cn5gCOTSUESanityCheck = finalizeDownstreamJob('OAI-CN5G-COTS-UE-Test')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += cn5gCOTSUESanityCheck
+              }
+            }
+          }
+        }
        stage ("SA-AERIAL-CN5G") {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-AERIAL-CN5G')
+              triggerDownstreamJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
            }
          }
          post {
@@ -738,7 +707,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-Multi-Antenna-CN5G')
+              triggerDownstreamJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
            }
          }
          post {
@@ -761,7 +730,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-FHI72-CN5G')
+              triggerDownstreamJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
            }
          }
          post {
@@ -784,7 +753,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-FHI72-MPLANE-CN5G')
+              triggerDownstreamJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
            }
          }
          post {
@@ -807,7 +776,7 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-Handover-CN5G')
+              triggerDownstreamJob ('RAN-SA-Handover-CN5G', 'SA-Handover-CN5G')
            }
          }
          post {
@@ -830,7 +799,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-AERIAL-OAIUE-CN5G')
+              triggerDownstreamJob ('RAN-SA-AERIAL-OAIUE-CN5G', 'SA-AERIAL-OAIUE-CN5G')
            }
          }
          post {
@@ -853,7 +822,7 @@ pipeline {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
            script {
-              triggerDownstreamJob ('RAN-SA-OAIUE-CN5G')
+              triggerDownstreamJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
            }
          }
          post {
@@ -878,47 +847,21 @@ pipeline {
  post {
    success {
      script {
-        if (env.GITHUB_PR_NUMBER) {
-          if (mrValidationWarning) {
-            def message = "**CI Build:** [#${env.BUILD_NUMBER}](${BUILD_URL}) | **Passed**"
-            message +=  "\n\n**Validation:** " + mrValidationWarning
-            githubPRComment comment: githubPRMessage(message)
-          }
-          githubNotify account: params.gitAccount,
-                       repo: params.gitRepo,
-                       credentialsId: 'github-jenkins-duranta',
-                       sha: env.GITHUB_PR_HEAD_SHA,
-                       status: 'SUCCESS',
-                       description: 'Build success',
-                       targetUrl: BUILD_URL,
-                       context: 'Jenkins Duranta CI'
+        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
+        if ("MERGE".equals(env.gitlabActionType)) {
+          addGitLabMRComment comment: message
+          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
        }
        echo "Pipeline is SUCCESSFUL"
      }
    }
    failure {
      script {
-        if (env.GITHUB_PR_NUMBER) {
-          def message = "**CI Build:** [#${env.BUILD_NUMBER}](${BUILD_URL}) | **Failed** on the following stages:"
-          if (failingStages) {
-            message += failingStages
-          } else {
-            message += "\nThe pipeline may have failed due to CI, validation, or scripting error. See the build for more details."
-          }
-          if (mrValidationWarning) {
-            message += '\n\n**Validation:** ' + mrValidationWarning
-          }
-          if (env.GITHUB_PR_LABELS) {
-            githubPRComment comment: githubPRMessage(message)
-          }
-          githubNotify account: params.gitAccount,
-                       repo: params.gitRepo,
-                       credentialsId: 'github-jenkins-duranta',
-                       sha: env.GITHUB_PR_HEAD_SHA,
-                       status: 'FAILURE',
-                       description: 'Build failed',
-                       targetUrl: BUILD_URL,
-                       context: 'Jenkins Duranta CI'
+        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
+        if ("MERGE".equals(env.gitlabActionType)) {
+          def fullMessage = message + '\n\nList of failing test stages:' + failingStages
+          addGitLabMRComment comment: fullMessage
+          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
        }
        echo "Pipeline FAILED"
      }
@@ -928,35 +871,41 @@ pipeline {

 // ----  Slave Job functions

-def triggerDownstreamJob (jobName) {
-  // Workaround for the "cancelled" pipeline notification
+def triggerDownstreamJob (jobName, gitlabStatusName) {
+  def MR_NUMBER = "MERGE".equals(env.gitlabActionType) ? env.gitlabMergeRequestIid : 'develop'
+  // Workaround for the "cancelled" GitLab pipeline notification
  // The downstream job is triggered with the propagate false so the following commands are executed
  // Its status is now PASS/SUCCESS from a stage pipeline point of view
  // localStatus variable MUST be analyzed to properly assess the status
  def localStatus = build job: jobName,
    parameters: [
-      string(name: 'targetRepo', value: String.valueOf(env.GIT_URL)),
-      string(name: 'sourceRepo', value: String.valueOf(env.GITHUB_PR_URL ?: env.GIT_URL)),
-      string(name: 'sourceBranch', value: String.valueOf(env.GITHUB_PR_SOURCE_BRANCH ?: gitLocalBranch)),
-      string(name: 'sourceCommit', value: String.valueOf(env.GITHUB_PR_HEAD_SHA ?: env.GIT_COMMIT)),
-      string(name: 'requestNumber', value: String.valueOf(env.GITHUB_PR_NUMBER ?: gitLocalBranch)),
-      booleanParam(name: 'mergeWithTarget', value: env.GITHUB_PR_NUMBER != null),
-      string(name: 'targetBranch', value: (env.GITHUB_PR_TARGET_BRANCH ?: gitLocalBranch)),
+      string(name: 'targetRepo', value: String.valueOf(env.gitlabTargetRepoHttpUrl)),
+      string(name: 'sourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
+      string(name: 'sourceBranch', value: String.valueOf(env.gitlabSourceBranch)),
+      string(name: 'sourceCommit', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+      string(name: 'requestNumber', value: String.valueOf(MR_NUMBER)),
+      booleanParam(name: 'mergeWithTarget', value: "MERGE".equals(env.gitlabActionType)),
+      string(name: 'targetBranch', value: String.valueOf(env.gitlabTargetBranch)),
      string(name: 'repository', value: String.valueOf(params.ciRepositoryURL)),
-      string(name: 'branch', value: String.valueOf(branch))
+      string(name: 'branch', value: "${env.gitlabSourceBranch.replace('/', '-')}-${env.gitlabMergeRequestLastCommit}")
    ], propagate: false
  def localResult = localStatus.getResult()
  echo "${jobName} Slave Job status is ${localResult}"
-  downstreamResults[jobName] = localStatus.resultIsBetterOrEqualTo('SUCCESS') ? 'SUCCESS' : 'FAILURE'
-  if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-    echo "${jobName} Slave Job is OK"
-  } else {
-    error "${jobName} Slave Job is KO"
+  gitlabCommitStatus(name: gitlabStatusName) {
+    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+       echo "${jobName} Slave Job is OK"
+    } else {
+       error "${jobName} Slave Job is KO"
+    }
  }
 }

-def triggerCN5GDownstreamJob (jobName) {
-  def fullRanTag = params.internalRegistry + '/oai-gnb:' + "${branch}"
+def triggerCN5GDownstreamJob (jobName, gitlabStatusName) {
+  if ("MERGE".equals(env.gitlabActionType)) {
+    fullRanTag = OAI_Registry + '/oai-gnb:' + "${env.gitlabSourceBranch.replace('/', '-')}-${env.gitlabMergeRequestLastCommit}"
+  } else {
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + env.GIT_COMMIT
+  }
  // Workaround for the "cancelled" GitLab pipeline notification
  // The downstream job is triggered with the propagate false so the following commands are executed
  // Its status is now PASS/SUCCESS from a stage pipeline point of view
@@ -967,11 +916,12 @@ def triggerCN5GDownstreamJob (jobName) {
    ], propagate: false
  def localResult = localStatus.getResult()
  echo "${jobName} Slave Job status is ${localResult}"
-  downstreamResults[jobName] = localStatus.resultIsBetterOrEqualTo('SUCCESS') ? 'SUCCESS' : 'FAILURE'
-  if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-    echo "${jobName} Slave Job is OK"
-  } else {
-    error "${jobName} Slave Job is KO"
+  gitlabCommitStatus(name: gitlabStatusName) {
+    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+       echo "${jobName} Slave Job is OK"
+    } else {
+       error "${jobName} Slave Job is KO"
+    }
  }
 }

@@ -979,13 +929,12 @@ def finalizeDownstreamJob(jobName) {
  lock ('Parent-Lock') {
    // In case of any non-success, we are retrieving the HTML report of the last completed
    // downstream job. The only drop-back is that we may retrieve the HTML report of a previous build
-    def fileName
    if (jobName == 'OAI-CN5G-COTS-UE-Test') {
      fileName = "test_results_oai_cn5g_cots_ue.html"
    } else {
      fileName = "test_results-${jobName}.html"
    }
-    def artifactUrl = BUILD_URL
+    artifactUrl = BUILD_URL
    if (!fileExists(fileName)) {
      copyArtifacts(projectName: jobName,
        filter: 'test_results*.html',
@@ -1001,15 +950,6 @@ def finalizeDownstreamJob(jobName) {
      // no need to add a prefixed '/'
      artifactUrl += 'artifact/' + fileName
    }
-    if (env.GITHUB_PR_NUMBER) {
-      githubNotify account: params.gitAccount,
-                   repo: params.gitRepo,
-                   credentialsId: "github-jenkins-duranta",
-                   sha: env.GITHUB_PR_HEAD_SHA,
-                   status: downstreamResults.getOrDefault(jobName, 'FAILURE'),
-                   targetUrl: "${artifactUrl}",
-                   context: jobName
-    }
    artifactUrl = "\n * [${jobName}](${artifactUrl})"
    return artifactUrl
  }
--- a/ci-scripts/Jenkinsfile-push-local-repo
+++ b/ci-scripts/Jenkinsfile-push-local-repo
@@ -23,54 +23,11 @@ pipeline {
    lock(extra: lockResources)
  }
  stages {
-    stage("Job init") {
-      steps {
-        buildName "${params.requestNumber ?: params.targetBranch}"
-        buildDescription "Branch: ${params.sourceBranch}"
-      }
-    }
-    stage('Checkout') {
-      steps {
-        script {
-          if (params.mergeWithTarget) {
-            echo "PR triggered - checking out merge ref for PR #${params.requestNumber}"
-            try {
-              checkout([
-                $class: 'GitSCM',
-                branches: [[name: "refs/remotes/origin/pr/${params.requestNumber}/merge"]],
-                userRemoteConfigs: [[
-                  url: params.targetRepo,
-                  refspec: "+refs/pull/${params.requestNumber}/merge:refs/remotes/origin/pr/${params.requestNumber}/merge",
-                  credentialsId: 'github-jenkins-duranta'
-                ]]
-              ])
-            } catch (e) {
-              error("Checkout failed for PR #${params.requestNumber} - " +
-                    "merge ref not found. The PR likely has a conflict with ${params.targetBranch} " +
-                    "that must be resolved before CI can run. (${e.message})")
-            }
-          } else {
-            echo "Push triggered - checking out branch ${params.targetBranch}"
-            try {
-              checkout([
-                $class: 'GitSCM',
-                branches: [[name: params.targetBranch]],
-                userRemoteConfigs: [[
-                  url: params.targetRepo,
-                  credentialsId: 'github-jenkins-duranta'
-                ]]
-              ])
-            } catch (e) {
-              error("Checkout failed for branch ${params.targetBranch} from ${params.targetRepo}. (${e.message})")
-            }
-          }
-        }
-      }
-    }
    stage('Verify parameters') {
      steps {
        script {
          def missingParams = []
+          if (!params.sourceRepo?.trim())   { missingParams << 'sourceRepo' }
          if (!params.sourceBranch?.trim())   { missingParams << 'sourceBranch' }
          if (!params.sourceCommit?.trim()) { missingParams << 'sourceCommit' }
          if (params.mergeWithTarget) {
@@ -82,6 +39,7 @@ pipeline {
            error "Missing required parameters: ${missingParams.join(', ')}"
          }

+          echo "Source Repo   : ${params.sourceRepo}"
          echo "Source Branch : ${params.sourceBranch}"
          echo "Source Commit : ${params.sourceCommit}"
          echo "Merge         : ${params.mergeWithTarget}"
@@ -95,17 +53,49 @@ pipeline {
    stage('Prepare workspace') {
      steps {
        sh """
-          git config user.email "oaicicdteam@openairinterface.org"
-          git config user.name "Duranta Jenkins"
+          git config user.email "jenkins@openairinterface.org"
+          git config user.name "OAI Jenkins"
+          git remote remove source || true
+          git remote remove target || true
          git remote remove internal-repo || true
        """
      }
    }
+    stage('Add source repo & fetch branches') {
+      steps {
+        sh """
+          git remote add source ${params.sourceRepo} || true
+          git fetch source ${params.sourceBranch}
+        """
+        script {
+          if (params.mergeWithTarget) {
+            sh """
+              git remote add target ${params.targetRepo} || true
+              git fetch target ${params.targetBranch}
+            """
+          }
+        }
+      }
+    }
    stage('Create testing branch for CI') {
      steps {
        sh """
          # Checkout source commit
-          git checkout -B ${params.branch}
+          git checkout -B ${params.branch} ${params.sourceCommit}
+        """
+      }
+    }
+    stage('Merge target into source') {
+      when { expression { return params.mergeWithTarget } }
+      steps {
+        sh """
+          echo "Merging target branch ${params.targetBranch} into source branch ${params.branch}"
+          if ! git merge --ff target/${params.targetBranch} \
+            -m "Merge ${params.targetBranch} into ${params.sourceBranch} for CI"; then
+            echo "Merge conflicts detected. Aborting."
+            git merge --abort || true
+            exit 1
+          fi
        """
      }
    }
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -46,9 +46,9 @@ pipeline {
    stage ("Push to DockerHub") {
      steps {
        script {
-          def WEEK_REF = sh returnStdout: true, script: 'date +"%Y.w%V"'
+          WEEK_REF = sh returnStdout: true, script: 'date +"%Y.w%V"'
          WEEK_REF = WEEK_REF.trim()
-          def WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
+          WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
          WEEK_TAG = WEEK_TAG.trim()
          if ((params.forceTag != null) && (params.tagToUse != null)) {
            if (params.forceTag) {
@@ -56,7 +56,7 @@ pipeline {
              echo "Forced Tag is ${WEEK_TAG}"
            }
          }
-          def WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%H" origin/develop'
+          WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%H" origin/develop'
          WEEK_SHA = WEEK_SHA.trim()

          withCredentials([
--- a/ci-scripts/Jenkinsfile-scheduled-run
+++ b/ci-scripts/Jenkinsfile-scheduled-run
@@ -92,7 +92,7 @@ pipeline {
            sourceBranch = selected_ref.replaceFirst("^origin/", "")
            commitID = sh(script: "git rev-parse ${selected_ref}", returnStdout: true).trim()
            echo "Found branch ${sourceBranch}, commit ${commitID}"
-            testBranch = "${sourceBranch}-${commitID}"
+            testBranch = "${sourceBranch}"
 	  }

          echo "CI executor node    :   ${pythonExecutor}"
--- a/ci-scripts/as_ue/multi-00105-100.cfg
+++ b/ci-scripts/as_ue/multi-00105-100.cfg
@@ -7,7 +7,7 @@
 #define N_ANTENNA_UL 1
 #define TDD 1

-log_options: "all.level=info,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
 log_filename: "/tmp/ue.log",

 /* Enable remote API and Web interface */
--- a/ci-scripts/as_ue/multi-00105-40.cfg
+++ b/ci-scripts/as_ue/multi-00105-40.cfg
@@ -7,7 +7,7 @@
 #define N_ANTENNA_UL 1
 #define TDD 1

-log_options: "all.level=info,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
 log_filename: "/tmp/ue.log",

 /* Enable remote API and Web interface */
--- a/ci-scripts/checkGitLabMergeRequestLabels.sh
+++ b/ci-scripts/checkGitLabMergeRequestLabels.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+function usage {
+    echo "OAI GitLab merge request applying script"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo ""
+    echo "    checkGitLabMergeRequestLabels.sh [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "------------------"
+    echo ""
+    echo "    --mr-id ####"
+    echo "    Specify the ID of the merge request."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 2 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    --mr-id)
+    MERGE_REQUEST_ID="$2"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+done
+
+LABELS=`curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/$MERGE_REQUEST_ID" | jq '.labels' || true`
+
+IS_MR_DOCUMENTATION=`echo $LABELS | grep -ic documentation`
+IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY`
+IS_MR_CI=`echo $LABELS | grep -c CI`
+IS_MR_4G=`echo $LABELS | grep -c 4G-LTE`
+IS_MR_5G=`echo $LABELS | grep -c 5G-NR`
+IS_MR_5G_UE=`echo $LABELS | grep -c nrUE`
+
+# none is present! No CI
+if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ] && [ $IS_MR_5G_UE -eq 0 ]
+then
+    echo "NONE"
+    exit 0
+fi
+
+# 4G and 5G or CI labels: run everything (4G, 5G)
+if [ $IS_MR_4G -eq 1 ] && [ $IS_MR_5G -eq 1 ] || [ $IS_MR_CI -eq 1 ]
+then
+    echo "FULL"
+    exit 0
+fi
+
+if [ $IS_MR_5G_UE -eq 1 ] && [ $IS_MR_4G -eq 1 ]
+then
+    echo "SHORTEN-4G-5G-UE"
+    exit 0
+fi
+
+# 4G is present: run only 4G
+if [ $IS_MR_4G -eq 1 ]
+then
+    echo "SHORTEN-4G"
+    exit 0
+fi
+
+# 5G is present: run only 5G
+if [ $IS_MR_5G -eq 1 ]
+then
+    echo "SHORTEN-5G"
+    exit 0
+fi
+
+if [ $IS_MR_5G_UE -eq 1 ]
+then
+    echo "SHORTEN-5G-UE"
+    exit 0
+fi
+
+# BUILD-ONLY is present: only build stages
+if [ $IS_MR_BUILD_ONLY -eq 1 ]
+then
+    echo "BUILD-ONLY"
+    exit 0
+fi
+
+# Documentation is present: don't do anything
+if [ $IS_MR_DOCUMENTATION -eq 1 ]
+then
+    echo "documentation"
+    exit 0
+fi
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -217,19 +217,11 @@ amarisoft_00105_40MHz:
  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_40MHz/multi-00105-40.cfg &
  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  Tracing:
-    Start: '' # nothing to be done
-    Stop: '' # nothing to be done
-    Collect: 'cp /tmp/ue.log %%log_dir%%'
 amarisoft_00105_100MHz:
  Host: amariue
  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_100MHz/multi-00105-100.cfg &
  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  Tracing:
-    Start: '' # nothing to be done
-    Stop: '' # nothing to be done
-    Collect: 'cp /tmp/ue.log %%log_dir%%'
 amarisoft_ue_1:
  Host: amariue
  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
--- a/ci-scripts/cls_analysis.py
+++ b/ci-scripts/cls_analysis.py
@@ -95,13 +95,13 @@ class Analysis():
 		test_summary['Nbfail'] =  nb_failed
 		return nb_failed == 0, test_summary, test_result

-	def analyze_rt_stats(thresholds, stat_files):
+	def analyze_rt_stats(thresholds, L1_stats, MAC_stats):
 		with open(thresholds, 'r') as f:
 			datalog_rt_stats = yaml.load(f, Loader=yaml.FullLoader)

 		rt_keys = datalog_rt_stats['Ref']
 		real_time_stats = {}
-		for sf in stat_files:
+		for sf in [L1_stats, MAC_stats]:
 			with open(sf, 'r') as f:
 				for line in f.readlines():
 					for k in rt_keys:
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -401,7 +401,7 @@ class Containerize():
 		# I would like to run it with --rm and mount the ctest result directory to avoid 'docker cp'
 		# below, but then permissions are messed up and we can't remove the directory without sudo
 		# making the next pipeline fail
-		ret = cmd.run(f'docker run -a STDOUT {runtime_opt} --shm-size=2g --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ran-unittests ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc) {ctest_opt}')
+		ret = cmd.run(f'docker run -a STDOUT {runtime_opt} --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ran-unittests ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc) {ctest_opt}')
 		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTest.log .')
 		archiveArtifact(cmd, ctx, f'{lSourcePath}/LastTest.log')
 		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTestsFailed.log .')
@@ -644,7 +644,7 @@ class Containerize():
 			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
 		return success

-	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None, stats_files=None):
+	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None):
 		logging.info(f'Analyzing realtime stats from server: {node}')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{self.workspace}/{yaml}'
@@ -660,20 +660,12 @@ class Containerize():
 				raise RuntimeError(f"Requested service {s} not found among services: {deployed_services}")
 			logging.info(f"Analyzing deployed service '{s}'")
 			# similar to BuildRunTests(), use docker cp to avoid problems with permissions
-			local_files = []
-			for sf in stats_files:
-				basename = os.path.basename(sf)
-				ret = cmd.run(f'docker compose -f {wd_yaml} cp {s}:{sf} {wd}/')
-				if ret.returncode != 0:
-					logging.error(f"Cannot retrieve {s}:{sf}")
-					return False
-				file = archiveArtifact(cmd, ctx, f"{wd}/{basename}")
-				if not file:
-					logging.error(f"Cannot retrieve file {basename}")
-					return False
-				local_files.append(file)
+			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrL1_stats.log {wd}/')
+			l1_file = archiveArtifact(cmd, ctx, f"{wd}/nrL1_stats.log")
+			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrMAC_stats.log {wd}/')
+			mac_file = archiveArtifact(cmd, ctx, f"{wd}/nrMAC_stats.log")

 		logging.info(f"check against thresholds from {thresholds}")
-		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, local_files)
+		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, l1_file, mac_file)
 		HTML.CreateHtmlDataLogTable(datalog_rt_stats)
 		return success
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -75,12 +75,12 @@ class HTMLManagement():
 			self.htmlFile.write('    <tr style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('      <td style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('        <a href="http://www.openairinterface.org/">\n')
-			self.htmlFile.write('           <img src="https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png" alt="" border="none" style="margin-right: 2rem;" width=150>\n')
+			self.htmlFile.write('           <img src="http://www.openairinterface.org/wp-content/uploads/2016/03/cropped-oai_final_logo2.png" alt="" border="none" height=50 width=150>\n')
 			self.htmlFile.write('           </img>\n')
 			self.htmlFile.write('        </a>\n')
 			self.htmlFile.write('      </td>\n')
 			self.htmlFile.write('      <td style="border-collapse: collapse; border: none; vertical-align: center;">\n')
-			self.htmlFile.write('        <b><font size = "6">TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
+			self.htmlFile.write('        <b><font size = "6">Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
 			self.htmlFile.write('      </td>\n')
 			self.htmlFile.write('    </tr>\n')
 			self.htmlFile.write('  </table>\n')
--- a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
+++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
@@ -184,8 +184,7 @@ L1s = (
    	{
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-	prach_dtx_threshold = 200;
-	}
+        }  
 );

 RUs = (
--- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
@@ -184,8 +184,7 @@ L1s = (
    	{
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-	prach_dtx_threshold = 200;
-	}
+        }  
 );

 RUs = (
--- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -48,8 +48,6 @@ gNBs =
        dl_carrierBandwidth                                            = 52;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 14025; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                  = 0;
@@ -70,7 +68,6 @@ gNBs =
      pMax                                                             = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                               = 14025;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                  = 0;
--- a/ci-scripts/conf_files/gnb-du.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -47,9 +47,6 @@ gNBs =
        dl_subcarrierSpacing                                        = 1;
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -68,8 +65,6 @@ gNBs =
      ul_carrierBandwidth                                           = 273;
      pMax                                                          = 23;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -47,8 +47,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -46,7 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        initialDLBWPlocationAndBandwidth                               = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -66,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
@@ -147,11 +145,9 @@ gNBs =

  );

-    first_active_bwp = 1;
    bwp_list = (
-      { scs = 1; bwpStart = 0; bwpSize = 106;},
-      { scs = 1; bwpStart = 0; bwpSize = 36;},
-      { scs = 1; bwpStart = 40; bwpSize = 50;}
+      { scs = 1; bwpStart = 0; bwpSize = 36; bwpId = 2;},
+      { scs = 1; bwpStart = 40; bwpSize = 50; bwpId = 3;}
    );

    # ------- SCTP definitions
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-benetel550.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-benetel550.conf
@@ -43,7 +43,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
@@ -64,7 +63,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-liteon.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-liteon.conf
@@ -42,8 +42,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-metanoia.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-metanoia.conf
@@ -44,8 +44,6 @@ gNBs =
     #initialDownlinkBWP
      #genericParameters
       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -64,7 +62,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.8x8-benetel650_650.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.8x8-benetel650_650.conf
@@ -47,8 +47,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                         = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                         = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                         = 25;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 0;
@@ -64,7 +62,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 0;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
@@ -47,9 +47,6 @@ gNBs =
        dl_carrierBandwidth                                            = 162;
     #initialDownlinkBWP
      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
     #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -48,8 +48,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -69,7 +67,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -51,9 +51,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -73,7 +70,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
@@ -50,10 +50,6 @@ gNBs =
        dl_subcarrierSpacing                                        = 1;
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -72,8 +68,6 @@ gNBs =
      ul_carrierBandwidth                                           = 273;
      pMax                                                          = 20;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
@@ -48,9 +48,6 @@ gNBs =
        dl_carrierBandwidth                                         = 78;
     #initialDownlinkBWP
      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 21175;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -70,7 +67,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 21175;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13475;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13475;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
+++ b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
@@ -44,8 +44,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -64,8 +62,6 @@ gNBs =
      ul_carrierBandwidth                                           = 273;
      pMax                                                          = 23;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.band79.106prb.vrtsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.106prb.vrtsim.phytest-dora.conf
@@ -1,222 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 4412.64 MHz
-      absoluteFrequencySSB                                             = 694176;
-      dl_frequencyBand                                                 = 79;
-      # this is 4400.94 MHz
-      dl_absoluteFrequencyPointA                                       = 693396;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 79;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
-});
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-});
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 50;
-  eNB_instances  = [0];
-});
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-};
-
--- a/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 162;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
@@ -48,8 +48,6 @@ gNBs =
        dl_carrierBandwidth                                            = 273;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +67,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -61,7 +59,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
@@ -45,8 +45,6 @@ gNBs =
        dl_carrierBandwidth                                         = 25;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 0;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 0;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -45,8 +45,6 @@ gNBs =
        dl_carrierBandwidth                                         = 25;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 0;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 0;
--- a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 66;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 17875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 3;
@@ -64,7 +62,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 17875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 3;
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -65,7 +63,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -49,9 +49,6 @@ gNBs =
        dl_carrierBandwidth                                            = 162;
     #initialDownlinkBWP
      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -71,7 +68,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
     #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4layers-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4layers-vvdn.conf
@@ -47,8 +47,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -46,8 +46,6 @@ gNBs = (
      dl_carrierBandwidth                   = 273;

      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 1099;
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                   = 1;
@@ -69,7 +67,6 @@ gNBs = (

      # initialUplinkBWP
        # genericParameters
-        initialULBWPlocationAndBandwidth                = 1099;
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                   = 1;
--- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
@@ -44,8 +44,6 @@ gNBs =
        dl_carrierBandwidth                                         = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -64,8 +62,7 @@ gNBs =
      ul_carrierBandwidth                                           = 51;
      pMax                                                          = 20;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                         = 106;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 28875; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                          = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                             = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                           = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                             = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -47,8 +47,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -70,7 +68,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -43,8 +43,6 @@ gNBs =
      dl_carrierBandwidth                                           = 106;
      #initialDownlinkBWP
      #genericParameters
-      # this is RBstart=0,L=106 (275*(L-1))+RBstart
-      initialDLBWPlocationAndBandwidth                              = 28875;
      # subcarrierSpacing
      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      initialDLBWPsubcarrierSpacing                                 = 1;
@@ -64,7 +62,6 @@ gNBs =
      pMax                                                          = 20;
      #initialUplinkBWP
      #genericParameters
-      initialULBWPlocationAndBandwidth                              = 28875;
      # subcarrierSpacing
      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      initialULBWPsubcarrierSpacing                                 = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -64,7 +62,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
@@ -145,11 +142,8 @@ gNBs =

    );

-    first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
-                { scs = 1; bwpStart = 0; bwpSize = 51;},
-                { scs = 1; bwpStart = 0; bwpSize = 24;});
-
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 51; bwpId = 2;},
+                { scs = 1; bwpStart = 0; bwpSize = 24; bwpId = 3;});

    # ------- SCTP definitions
    SCTP : {
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
@@ -39,9 +39,7 @@ gNBs =
        dl_subcarrierSpacing                                         = 1;
        dl_carrierBandwidth                                          = 106;
     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                             = 28875;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                = 1;
@@ -60,8 +58,7 @@ gNBs =
      ul_carrierBandwidth                                            = 106;
      pMax                                                           = 20;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                             = 28875;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -36,8 +36,6 @@ gNBs:
        dl_carrierBandwidth: 106
        #initialDownlinkBWP
        #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth: 28875
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing: 1
@@ -56,7 +54,6 @@ gNBs:
        pMax: 20
        #initialUplinkBWP
        #genericParameters
-        initialULBWPlocationAndBandwidth: 28875
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing: 1
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
@@ -39,8 +39,6 @@ gNBs:
        dl_carrierBandwidth: 106
        #initialDownlinkBWP
        #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth: 28875
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing: 1
@@ -59,7 +57,6 @@ gNBs:
        pMax: 20
        #initialUplinkBWP
        #genericParameters
-        initialULBWPlocationAndBandwidth: 28875
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing: 1
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                            = 24;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 6325;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6325;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf
@@ -44,8 +44,6 @@ gNBs =
        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                               = 1;
@@ -65,7 +63,6 @@ gNBs =
      pMax                                                          = 23;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 273;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 1099; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                  = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
@@ -49,8 +49,6 @@ gNBs =
        dl_carrierBandwidth                                            = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -71,7 +69,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -41,8 +41,6 @@ gNBs =
        dl_carrierBandwidth                                            = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/untested/benetel-5g.conf
+++ b/ci-scripts/conf_files/untested/benetel-5g.conf
@@ -44,8 +44,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368; 
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -65,7 +63,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368; 
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
+++ b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
@@ -45,8 +45,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -66,7 +64,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6366;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6366;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -61,8 +61,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -82,7 +80,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -57,8 +57,6 @@ gNBs =
        dl_carrierBandwidth                                            = 133;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=133 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 36300;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -78,7 +76,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 36300;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -64,8 +64,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -87,7 +85,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -61,7 +59,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -45,8 +45,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -66,7 +64,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -46,8 +46,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=43,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -43,8 +43,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -65,7 +63,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -48,8 +48,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +67,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -61,8 +61,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -82,7 +80,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -62,8 +62,6 @@ gNBs =
        dl_carrierBandwidth                                            = 162;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                           = 1;
@@ -83,7 +81,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                                           = 1;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -40,8 +40,6 @@ gNBs =
        dl_carrierBandwidth                                            = 51;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -61,7 +59,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -42,8 +42,6 @@ gNBs =
        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialDLBWPsubcarrierSpacing                                   = 1;
@@ -63,7 +61,6 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        initialULBWPsubcarrierSpacing                               = 1;
--- a/ci-scripts/datalog_rt_stats.gnb.40.vrtsim.yaml
+++ b/ci-scripts/datalog_rt_stats.gnb.40.vrtsim.yaml
@@ -1,32 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-#this is a configuration file
-#used to build real time processing statistics
-#for 5G NR phy test (gNB terminate)
-Title : gNB Processing Time (us) from datalog_rt_stats.default.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref :
-  L1 Tx processing : 190.0
-  DLSCH encoding : 120.0
-  L1 Rx processing : 235.0
-  UL segments decoding : 120.0
-  PUSCH inner-receiver : 150.0
-  UL Indication : 2.0
-  Slot Indication : 10.0
-  feprx : 40.0
-  feptx_ofdm (per port, half_slot) : 30
-  feptx_total : 52
-DeviationThreshold :
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  UL segments decoding : 0.25
-  PUSCH inner-receiver : 0.25
-  UL Indication : 1.00
-  Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25
--- a/ci-scripts/datalog_rt_stats.ue.40.vrtsim.yaml
+++ b/ci-scripts/datalog_rt_stats.ue.40.vrtsim.yaml
@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-#this is a configuration file
-#used to build real time processing statistics
-#for 5G NR phy test (gNB terminate)
-Title : UE Processing Time (us) from datalog_rt_stats.ue.40.vrtsim.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref :
-  RX_PDSCH_STATS : 62.0
-  DLSCH_RX_PDCCH_STATS : 30.5
-  RX_DFT_STATS : 5.5
-  DLSCH_CHANNEL_ESTIMATION_STATS : 39.0
-  DLSCH_DECODING_STATS : 178.0
-  DLSCH_LDPC_DECODING_STATS : 78.0
-  DLSCH_LLR_STATS : 25.0
-  DLSCH_LAYER_DEMAPPING : 8.5
-  DLSCH_PROCEDURES_STATS : 188.0
-  PHY_PROC_TX : 158.0
-  PUSCH_PROC_STATS : 167.0
-  ULSCH_LDPC_ENCODING_STATS : 43.0
-  ULSCH_ENCODING_STATS : 121.0
-  OFDM_MOD_STATS : 44.5
-DeviationThreshold :
-  RX_PDSCH_STATS : 0.25
-  DLSCH_RX_PDCCH_STATS : 0.25
-  RX_DFT_STATS : 0.25
-  DLSCH_CHANNEL_ESTIMATION_STATS : 0.25
-  DLSCH_DECODING_STATS : 0.25
-  DLSCH_LDPC_DECODING_STATS : 0.25
-  DLSCH_LLR_STATS : 0.25
-  DLSCH_LAYER_DEMAPPING : 0.5
-  DLSCH_PROCEDURES_STATS : 0.25
-  PHY_PROC_TX : 0.25
-  PUSCH_PROC_STATS : 0.25
-  ULSCH_LDPC_ENCODING_STATS : 0.25
-  ULSCH_ENCODING_STATS : 0.25
-  OFDM_MOD_STATS : 0.25
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu
@@ -10,7 +10,8 @@
 FROM ran-base:develop AS ran-tests

 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
        libgtest-dev \
        libyaml-cpp-dev \
        libzmq3-dev \
@@ -25,9 +26,7 @@ WORKDIR /oai-ran
 COPY . .

 WORKDIR /oai-ran/build
-RUN --mount=type=cache,target=/root/.cache/ccache/ \
-    --mount=type=cache,target=/root/.cache/cpm/ \
-    cmake .. -GNinja \
+RUN cmake .. -GNinja \
      -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug \
      -DSANITIZE_ADDRESS=True -DOAI_VRTSIM_TAPS_CLIENT=ON -DOAI_RU_FRONTHAUL=ON \
    && \
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -245,8 +245,7 @@ def ExecuteActionWithParam(action, ctx, node):
 	elif action == 'AnalyzeRTStats_Object':
 		yaml = test.findtext('stats_cfg')
 		service = test.findtext('service')
-		stats_files = (test.findtext('stats_file') or '').split()
-		success = CONTAINERS.AnalyzeRTStatsObject(HTML, node, ctx, yaml, service, stats_files)
+		success = CONTAINERS.AnalyzeRTStatsObject(HTML, node, ctx, yaml, service)

 	else:
 		logging.warning(f"unknown action {action}, skip step")
--- a/ci-scripts/pre-ci-check.sh
+++ b/ci-scripts/pre-ci-check.sh
@@ -25,6 +25,8 @@ function usage {
 SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 TARGET_BRANCH="origin/develop"

+git fetch --quiet
+
 while getopts ":s:t:h" opt; do
    case "$opt" in
        s)
@@ -55,20 +57,11 @@ done
 # ----------------------------
 # Merged commits
 # ----------------------------
-if [[ "$SOURCE_BRANCH" =~ ^[0-9a-f]{40}$ ]]; then
-  # note: if no branch could be found, it will result in "" and git rev-list
-  # will use the commit ID. Exclude "HEAD detached at", then use first branch
-  # name.
-  BRANCH_NAME=$(git branch -a --points-at $SOURCE_BRANCH --format='%(refname:short)' | grep -v detached | head -n1)
-  echo "SHA recognized in $SOURCE_BRANCH, using \"$BRANCH_NAME\" as branch name"
-else
-  BRANCH_NAME="$SOURCE_BRANCH"
-fi
-if [[ ! "$BRANCH_NAME" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
-    mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
+mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
+if [[ ! "$SOURCE_BRANCH" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
    if [[ -n "$mergeCommits" ]]; then
-        message="Error: Following merge commits are found in the source branch history. Please rebase your branch.\n\n"
-        message+="$(echo "$mergeCommits" | paste -sd ',' | sed 's/,/, /g')\n"
+        message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
+        message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
        echo -e "$message"
        exit 3
    fi
@@ -82,7 +75,7 @@ unsignedCommits=$(
        if ! git log -1 --format=%B "$c" | grep -q "Signed-off-by:"; then
            git log -1 --format='%h' "$c"
        fi
-    done | paste -sd ',' | sed 's/,/, /g'
+    done | paste -sd ","
 )

 # ----------------------------
@@ -91,13 +84,13 @@ unsignedCommits=$(
 message=""

 if [ -n "$unsignedCommits" ]; then
-    message="The following commit(s) are missing a Signed-off-by:\n\n$unsignedCommits\n\n"
-    message+="Please use 'git commit -s' to sign your commits.\n"
-    message+="For detailed instructions, refer to the CONTRIBUTING file at the root of this repository."
+    message="> WARNING: The following commit(s) are missing a Signed-off-by:\n>\n> $unsignedCommits\n>\n"
+    message+="> Please use 'git commit -s' to sign your commits.\n>\n"
+    message+="> For detailed instructions, refer to the CONTRIBUTING file at the root of this repository."
    echo -e "$message"
    exit 1
 else
-    message="All commits are signed off using 'git commit -s'."
+    message="> All commits are signed off using 'git commit -s'."
    echo -e "$message"
    exit 0
 fi
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -145,6 +145,6 @@ class RANManagement():
 			mac_file = archiveArtifact(cmd, ctx, f"{logdir}/nrMAC_stats.log")

 		logging.info(f"check against thresholds from {thresholds}")
-		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, [l1_file, mac_file])
+		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, l1_file, mac_file)
 		HTML.CreateHtmlDataLogTable(datalog_rt_stats)
 		return success
--- a/ci-scripts/tests/analysis.py
+++ b/ci-scripts/tests/analysis.py
@@ -26,7 +26,7 @@ class TestAnalysis(unittest.TestCase):
 		rtsf = "datalog_rt_stats.100.2x2.yaml"
 		l1f = "tests/analysis/gnb_phytest.success.nrL1.log"
 		macf = "tests/analysis/gnb_phytest.success.nrMAC.log"
-		status, s = cls_analysis.Analysis.analyze_rt_stats(rtsf, [l1f, macf])
+		status, s = cls_analysis.Analysis.analyze_rt_stats(rtsf, l1f, macf)
 		self.assertTrue(status)
 		self.assertEqual(s['Title'], "Processing Time (us) from datalog_rt_stats.100.2x2.yaml")
 		self.assertEqual(s['ColNames'], ["Metric", "Average; Max; Count", "Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)"])
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -136,7 +136,7 @@ class TestDeploymentMethods(unittest.TestCase):

 	def test_create_workspace(self):
 		self.cont.workspace = tempfile.mkdtemp()
-		self.cont.repository = "https://github.com/duranta-project/openairinterface5g.git"
+		self.cont.repository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
 		self.cont.branch = "develop"
 		ws = self.cont.Create_Workspace(self.node, self.html)
 		with cls_cmd.LocalCmd() as cmd:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
francescomani	5774870122	set 1st active bwp in dlsim and ulsim Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:03:34 +02:00
francescomani	a9f69e805e	improvements in check of BWP config file parameters in case of default 1st active full bwp Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:03:34 +02:00
francescomani	b857c8785d	remove unnecessary initialBWP in initial_SpCellConfig Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:03:34 +02:00
francescomani	3c1829bcd1	1st active BWP after setup (including option to select it from config file) Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:03:33 +02:00
francescomani	44ee879ab8	automatic selection of full BWP (first dedicated BWP) Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:03:33 +02:00
francescomani	09aa958e88	automatic selection of intial BWP in fix_scc also removed parameters for initial BWP selection from config files Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 10:02:49 +02:00
francescomani	31bb4cb483	function to automatically set initial BWP Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 09:57:10 +02:00
francescomani	d571ee97ec	function for cset0 tables Signed-off-by: francescomani <email@francescomani.it>	2026-05-30 09:57:09 +02:00