log reduction

initial synch : SSS threshold condition removed
bugfix in command-line parameters
2026-07-13 12:40:28 +00:00 · 2023-07-27 16:34:46 +02:00 · 2023-07-27 12:36:36 +02:00 · 2023-07-26 21:09:54 +02:00 · 2023-07-26 13:46:14 -04:00 · 2023-07-26 13:44:31 -04:00
2177 changed files with 151316 additions and 212502 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -60,8 +60,6 @@ ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
-  - RB_FOREACH
-  - UE_iterator
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,8 @@ cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/

-# IDE files
+# vscode
 .vscode
-.cproject
-.project
-.settings

 # Tags for vim/global
 GPATH
@@ -25,4 +22,3 @@ tags
 nfapi_nr_interface_scf
 *.log
 *.out
-CMakeUserPresets.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "openair2/E2AP/flexric"]
-	path = openair2/E2AP/flexric
-	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
-	branch = remotes/origin/service-models-integration
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/cmake_targets/ran_build/build/lte-softmodem",
+            "args": [
+                "-O", "../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf",
+                "--noS1"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/cmake_targets",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "miDebuggerPath": "${workspaceFolder}/cmake_targets/sudo-gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,61 +1,5 @@
 # RELEASE NOTES: #

-## [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.
-
-* 5G gNB
-  - Add support for O-RAN 7.2 fronthaul interface
-    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
-  - Add support for 2-layer UL MIMO
-  - FDD interoperability with COTS UE
-  - Compiles on ARM (through SIMDE)
-  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
-  - Add support for E1AP
-  - Add support for multiple DUs and CU-UPs at one CU-CP
-  - FR2 SA with OAI UE
-  - Improve computational efficiency
-* 5G UE
-  - Cleanup in MAC and RRC towards support of 3rd-party gNB
-  - FR2 SA with OAI gNB
-  - Improve computational efficiency
-
-Overall the stability is improved for the same resource usage.
-
-There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
-interoperability is under testing.
-
-This release also includes many fixes and documentation updates.
-
-## [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
-  - PHY, MAC, RLC, PDCP, SDAP, RRC layers
-  - 2x2 MIMO and 256-QAM for UL/DL
-  - 15 and 30 kHz subcarrier spacings; 10-100 MHz bandwidths
-  - Up to 800Mbps throughput or 5ms latency
-  - F1, basic E1, 5G FAPI (SCF 222.10.02), split 8 split options
-  - Handling of up to 16 UEs
-  - RRC procedures for connection setup, multiple PDU sessions, reestablishment
-* 5G SA in UE
-  - PHY, MAC, RLC, PDCP, SDAP, RRC layers
-  - 2x2 MIMO and 256-QAM for UL/DL
-  - 15 and 30 kHz subcarrier spacings; 10-100 MHz bandwidths
-  - Custom FAPI-like MAC/PHY interface
-  - RRC procedures for connection setup and cell measurement
-* Basic 5G NSA in gNB
-  - X2 sgNB Addition Request between OAI eNB and gNB
-* 4G eNB and UE
-  - Bugfixes in fairRR scheduler (eNB)
-  - Non-standard F1 midhaul removed (eNB)
-  - FlexRAN removed (eNB)
-  - Sync fixes (UE)
-* LTE-M supported
-* Support for AW2S devices, RFsimulator channel emulation support
-
-For more information on supported features, please refer to the [feature set](doc/FEATURE_SET.md).
-
 ## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##

 * Bug fix for mutex lock for wake-up signal
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,64 +0,0 @@
-{
-    "version": 3,
-    "configurePresets": [
-        {
-            "name": "default",
-            "displayName": "Default Config",
-            "description": "Default build using Ninja generator",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        },
-        {
-            "name": "tests",
-            "displayName": "Default unit test config",
-            "inherits": "default",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build_test",
-            "cacheVariables": {
-                "ENABLE_TESTS": "ON",
-                "SANITIZE_ADDRESS": "ON",
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        }
-    ],
-    "buildPresets": [
-        {
-            "name": "5gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "nr-uesoftmodem",
-                "nr-softmodem",
-                "rfsimulator",
-                "dfts",
-                "ldpc",
-                "params_libconfig",
-                "params_yaml"
-            ]
-        },
-        {
-            "name": "default",
-            "inherits": "5gdefault"
-        },
-        {
-            "name": "4gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "lte-softmodem",
-                "lte-uesoftmodem",
-                "dfts",
-                "coding",
-                "rfsimulator",
-                "params_libconfig"
-            ]
-        },
-        {
-            "name": "tests",
-            "configurePreset": "tests",
-            "targets": [
-                "tests"
-            ]
-        }
-    ]
-}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,26 +5,24 @@ We want to make contributing to this project as easy and transparent as possible
 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.
+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:contact@openairinterface.org).
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us (mailto:contact@openairinterface.org).
   - Eurecom GitLab does NOT accept public email domains.
-3. Provide the OAI team with the **username** of this account to
-   (mailto:contact@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).
-   - 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.
+3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
+4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home).
+   - 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.
+   - All merge requests SHALL have `develop` branch as target branch.
+   - All merge requests SHALL have source branch names that SHALL not contain the `/` character.
+      * We are using a `docker` registry scheme and the image names are based on the source branch name.

-# License #
+## Coding Styles ##

-By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under the license described in the file [`LICENSE`](./LICENSE) in the
-root directory of this source tree.
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home).
+
+## License ##
+
+By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -4,6 +4,15 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di

 However, the source code also contains third party software that is acknowledged here for reference.

+## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
+
+See on [liblfds website](https://liblfds.org/) the license section.
+
+<pre>
+"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
+If however for legal reasons a licence is required, the license of your choice will be granted."
+</pre>
+
 ## Credits for source code common/utils/collection/queue.h: ##

 The Regents of the University of California: BSD 3-Clause Licence.
--- a/README.md
+++ b/README.md
@@ -4,15 +4,12 @@

 <p align="center">
    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></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://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></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 RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>
-</p>
-
-<p align="center">
-    <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>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>

 <p align="center">
@@ -24,7 +21,6 @@
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
-  <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>

 # OpenAirInterface License #
@@ -42,7 +38,6 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in

 *  [General overview of documentation](./doc/README.md)
 *  [The implemented features](./doc/FEATURE_SET.md)
- *  [System Requirements for Using OAI Stack](./doc/system_requirements.md)
 *  [How to build](./doc/BUILD.md)
 *  [How to run the modems](./doc/RUNMODEM.md)

@@ -70,28 +65,10 @@ openairinterface5g
 ├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
 ├── nfapi             : (n)FAPI code for MAC-PHY interface
-├── openair1          : Layer 1 (3GPP LTE Rel-10/12 PHY, NR Rel-15 PHY)
-├── openair2          : Layer 2 (3GPP LTE Rel-10 MAC/RLC/PDCP/RRC/X2AP, LTE Rel-14 M2AP, NR Rel-15+ MAC/RLC/PDCP/SDAP/RRC/X2AP/F1AP/E1AP), E2AP
-├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
-├── targets           : Some configuration files; only historical relevance, and might be deleted in the future
-└── tools             : Tools for use by the developers/ci machines: code analysis and formatting
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
+└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
-
-# How to get support from the OAI Community # 
-
-You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).
-
-Your email should contain below information:
-
- A clear subject in your email.
- For all the queries there should be [Query\] in the subject of the email and for problems there should be [Problem\].
- In case of a problem, add a small description.
- Do not share any photos unless you want to share a diagram.
- 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 [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.
-
-Always remember a structured email will help us understand your issues quickly.
--- a/charts/physims/charts/nr-pbchsim.scs/Chart.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/Chart.yaml
@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-scs
-description: A Helm subchart for nr-pbchsim network function ("Other SCS" tests)
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-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.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-pbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org
--- a/charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl
+++ b/charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl
@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-scs.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-pbchsim-scs.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-pbchsim-scs.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-scs.chart" . }}
-{{ include "oai-nr-pbchsim-scs.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-scs.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-scs.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-scs.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
--- a/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
@@ -1,42 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.otherSCS" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
-      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.scs/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/values.yaml
@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-scs
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-pbchsim-scs"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
--- a/charts/physims/charts/nr-psbchsim/Chart.yaml
+++ b/charts/physims/charts/nr-psbchsim/Chart.yaml
@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-psbchsim
-description: A Helm subchart for nr-psbchsim network function
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-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.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-psbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org
--- a/charts/physims/charts/nr-psbchsim/templates/_helpers.tpl
+++ b/charts/physims/charts/nr-psbchsim/templates/_helpers.tpl
@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-psbchsim.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-psbchsim.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-psbchsim.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-psbchsim.labels" -}}
-helm.sh/chart: {{ include "oai-nr-psbchsim.chart" . }}
-{{ include "oai-nr-psbchsim.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-psbchsim.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-psbchsim.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-psbchsim.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-psbchsim.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
--- a/charts/physims/charts/nr-psbchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-psbchsim/templates/job.yaml
@@ -1,42 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_psbchsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName.nrpsbchsim}}
-      nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
-      {{- end }}
--- a/charts/physims/charts/nr-psbchsim/values.yaml
+++ b/charts/physims/charts/nr-psbchsim/values.yaml
@@ -1,48 +0,0 @@
-# Default values for oai-nr-psbchsim
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-psbchsim"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -27,15 +27,13 @@ global:
    nrpbschsim106rb: dedale
    nrpbchsim217rb: dedale
    nrpbchsim273rb: dedale
-    nrpbchsimscs: dedale
-    nrpsbchsim: dedale
    nrprachsim: dedale
    nrpucchsim: dedale
-    nrulschsim: demophon
-    nrulsim3gpp: demophon
-    nrulsimmimo: demophon
-    nrulsimmisc: demophon
-    nrulsimscfdma: demophon
-    polartest: demophon
-    smallblocktest: demophon
-    ulsim: demophon
+    nrulschsim: theseus
+    nrulsim3gpp: theseus
+    nrulsimmimo: theseus
+    nrulsimmisc: theseus
+    nrulsimscfdma: theseus
+    polartest: theseus
+    smallblocktest: theseus
+    ulsim: theseus
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -31,9 +31,6 @@ def do5Gtest = false
 //
 def gitCommitAuthorEmailAddr

-// list of failing stages
-def failingStages = ""
-
 pipeline {
  agent {
    label nodeExecutor
@@ -106,6 +103,7 @@ pipeline {
            gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
            gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
            echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
+            sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
          }
        }
      }
@@ -120,49 +118,44 @@ pipeline {
      }
    }
    // Build Stages are Mandatory
+    // Later we will add a Ubuntu20 build
    stage ("Image Building Processes") {
      when { expression {doBuild} }
      parallel {
-        stage ("Ubuntu-Image-Builder") {
+        stage ("Ubuntu18-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
+              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuBuildStatus = finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
+                finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuBuildStatus
              }
            }
          }
        }
-        stage ("RHEL-Cluster-Image-Builder") {
+        stage ("RHEL8-Cluster-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
+              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL8-Cluster-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rhelBuildStatus = finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
+                finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rhelBuildStatus
              }
            }
          }
@@ -176,37 +169,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                cppcheckStatus = finalizeSlaveJob('RAN-cppcheck')
+                finalizeSlaveJob('RAN-cppcheck')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += cppcheckStatus
-              }
-            }
-          }
-        }
-        stage ("ARM-Cross-Compile") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                armBuildStatus = finalizeSlaveJob('RAN-ARM-Cross-Compile-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += armBuildStatus
              }
            }
          }
@@ -226,15 +194,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                physimStatus = finalizeSlaveJob('RAN-PhySim-Cluster')
+                finalizeSlaveJob('RAN-PhySim-Cluster')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += physimStatus
              }
            }
          }
@@ -249,15 +214,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim4GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-4G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-4G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim4GStatus
              }
            }
          }
@@ -272,15 +234,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim5GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-5G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim5GStatus
              }
            }
          }
@@ -295,15 +254,32 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                l2Sim4GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+                finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
+        stage ("L2-Sim-Test-5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-L2-Sim-Test-5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += l2Sim4GStatus
              }
            }
          }
@@ -312,45 +288,18 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-FDD-LTEBOX-Container')
+              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'RAN-LTE-FDD-LTEBOX-Container')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteTDDB200Status = finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteTDDB200Status
-              }
-            }
-          }
-        }
-        // Pipeline to test OAI LTE-UE
-        stage ("LTE-B200-FDD-OAIUE-OAICN4G-Container") {
-          when { expression {do4Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container', 'LTE-FDD-OAIUE-OAICN4G-Container')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteFDDB200OAIUEStatus = finalizeSlaveJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200OAIUEStatus
              }
            }
          }
@@ -359,21 +308,18 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-TDD-LTEBOX-Container')
+              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'RAN-LTE-TDD-LTEBOX-Container')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteFDDB200Status = finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200Status
              }
            }
          }
@@ -388,15 +334,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                nsaTDDB200Status = finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
+                finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += nsaTDDB200Status
              }
            }
          }
@@ -411,15 +354,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saTDDB200Status = finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
+                finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saTDDB200Status
              }
            }
          }
@@ -434,15 +374,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                phytestLDPCoffloadStatus = finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
+                finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += phytestLDPCoffloadStatus
              }
            }
          }
@@ -457,15 +394,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteTDD2x2N3xxStatus = finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteTDD2x2N3xxStatus
              }
            }
          }
@@ -480,15 +414,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAW2SStatus = finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saAW2SStatus
              }
            }
          }
@@ -503,130 +434,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+                finalizeSlaveJob('RAN-Interop-F1')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += f1InteropStatus
-              }
-            }
-          }
-        }
-        stage ("Sanity-Check OAI-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerCN5GSlaveJob ('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 = finalizeSlaveJob('OAI-CN5G-COTS-UE-Test')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += cn5gCOTSUESanityCheck
-              }
-            }
-          }
-        }
-        stage ("SA-AERIAL-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saAERIALStatus
-              }
-            }
-          }
-        }
-        stage ("SA-2x2-Module-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saTDD2x2Status
-              }
-            }
-          }
-        }
-        stage ("SA-FHI72-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72Status
-              }
-            }
-          }
-        }
-        stage ("SA-OAIUE-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saOAIUEStatus = finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saOAIUEStatus
              }
            }
          }
@@ -645,13 +458,30 @@ pipeline {
          script {
            echo "Push to Docker-Hub KO"
            currentBuild.result = 'FAILURE'
-            failingStages += '\n * RAN-DockerHub-Push'
          }
        }
      }
    }
  }
  post {
+    always {
+      script {
+        def eSubject = JOB_NAME + ' - Build # ' + BUILD_ID + ' - ' + currentBuild.result + '!'
+        def eBody = "Hi,\n\n"
+        eBody += "Here are attached HTML report files for " + JOB_NAME + "  - Build # " + BUILD_ID + " - " + currentBuild.result + "!\n\n"
+        eBody += "Regards,\n"
+        eBody += "OAI CI Team"
+        emailext attachmentsPattern: '*results*.html',
+           body: eBody,
+           replyTo: 'no-reply@openairinterface.org',
+           subject: eSubject,
+           to: gitCommitAuthorEmailAddr
+
+        if (fileExists('.git/CI_COMMIT_MSG')) {
+          sh "rm -f .git/CI_COMMIT_MSG"
+        }
+      }
+    }
    success {
      script {
        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
@@ -669,8 +499,7 @@ pipeline {
      script {
        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
+          addGitLabMRComment comment: message
          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
          sendSocialMediaMessage('ci-enb', 'danger', message2)
        } else {
@@ -709,37 +538,8 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
       echo "${jobName} Slave Job is OK"
    } else {
-       error "${jobName} Slave Job is KO"
-    }
-  }
-}
-
-def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
-  if ("MERGE".equals(env.gitlabActionType)) {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
-    shortenShaOne = shortenShaOne.trim()
-    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
-  } else {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
-    shortenShaOne = shortenShaOne.trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:develop-' + shortenShaOne
-  }
-  // Workaround for the "cancelled" GitLab pipeline notification
-  // The slave 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
-  localStatus = build job: jobName,
-    parameters: [
-      string(name: 'FULL_RAN_TAG', value: String.valueOf(fullRanTag))
-    ], propagate: false
-  localResult = localStatus.getResult()
-  echo "${jobName} Slave Job status is ${localResult}"
-  gitlabCommitStatus(name: gitlabStatusName) {
-    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-       echo "${jobName} Slave Job is OK"
-    } else {
-       error "${jobName} Slave Job is KO"
+       echo "${jobName} Slave Job is KO"
+       sh "ci-scripts/fail.sh"
    }
  }
 }
@@ -768,34 +568,23 @@ def triggerSlaveJobNoGitLab (jobName) {
  if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
     echo "${jobName} Slave Job is OK"
  } else {
-     error "${jobName} Slave Job is KO"
+     echo "${jobName} Slave Job is KO"
+     sh "ci-scripts/fail.sh"
  }
 }

 def finalizeSlaveJob(jobName) {
-  lock ('Parent-Lock') {
-    // In case of any non-success, we are retrieving the HTML report of the last completed
-    // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
-    if (jobName == 'OAI-CN5G-COTS-UE-Test') {
-      fileName = "test_results_oai_cn5g_cots_ue.html"
-    } else {
-      fileName = "test_results-${jobName}.html"
+  // In case of any non-success, we are retrieving the HTML report of the last completed
+  // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
+  fileName = "test_results-${jobName}.html"
+  if (!fileExists(fileName)) {
+    copyArtifacts(projectName: jobName,
+      filter: 'test_results*.html',
+      selector: lastCompleted())
+    if (fileExists(fileName)) {
+      sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
+      archiveArtifacts artifacts: fileName
    }
-    artifactUrl = BUILD_URL
-    if (!fileExists(fileName)) {
-      copyArtifacts(projectName: jobName,
-        filter: 'test_results*.html',
-        selector: lastCompleted())
-      if (fileExists(fileName)) {
-        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
-        archiveArtifacts artifacts: fileName
-        // BUILD_URL is like  http://server:port/jenkins/job/foo/15/
-        // no need to add a prefixed '/'
-        artifactUrl += 'artifact/' + fileName
-      }
-    }
-    artifactUrl = "\n * [${jobName}](${artifactUrl})"
-    return artifactUrl
  }
 }

--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -67,13 +67,6 @@ pipeline {
  }

  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
    stage ('Verify Parameters') {
      steps {
        script {
@@ -200,8 +193,6 @@ pipeline {
              if (fileExists(xmlFile)) {
                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
              }
            }
            withCredentials([
@@ -213,9 +204,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-colosseum
+++ b/ci-scripts/Jenkinsfile-colosseum
@@ -1,124 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-def node = "porcepix"
-def resource = "CI-NEU-CI"
-
-pipeline {
-  agent {
-    label node
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    timeout(time: 3, unit: 'HOURS')
-  }
-  stages {
-    stage ("Trigger NEU CI") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              // use eNB target branch variable if eNB repository is empty
-              def git_Branch = ""
-              if (params.eNB_Branch.isEmpty()) {
-                echo 'eNB_Branch parameter is empty, using eNB_TargetBranch instead'
-                git_Branch = params.eNB_TargetBranch
-              } else {
-                git_Branch = params.eNB_Branch
-              }
-
-              // use default 10011 rf scenario if not specified
-              if (params.Colosseum_Rf_Scenario.isEmpty()) {
-                echo 'Colosseum_Rf_Scenario parameter is empty, defaulting to 10011'
-                rf_scenario = "10011"
-              } else {
-                rf_scenario = params.Colosseum_Rf_Scenario
-              }
-
-              sh "echo Testing reachability of Colosseum endpoint"
-              sh "ping -c 3 10.100.1.253"
-
-              sh "./ci-scripts/colosseum_scripts/launch-job.sh ${col_username} ${col_password} ${currentBuild.number} ${params.eNB_Repository} ${git_Branch} ${rf_scenario} ${env.JOB_URL}"
-            }
-          }
-        }
-      }
-    }
-    stage ("Wait for job to finish") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              timeout (time: 2, unit: 'HOURS') {
-                sh "./ci-scripts/colosseum_scripts/wait-job-end.sh ${col_username} ${col_password}"
-              }
-            }
-          }
-        }
-      }
-    }
-    stage ("Get test results") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              sh "./ci-scripts/colosseum_scripts/get-test-results.sh ${col_username} ${col_password}"
-            }
-
-            if(fileExists("results.tar.xz")) {
-              archiveArtifacts "results.tar.xz"
-
-              sh "mkdir -p results"
-              sh "tar -xf results.tar.xz -C results --strip-components=1"
-
-              if(fileExists("results/test_summary.html")) {
-                archiveArtifacts "results/test_summary.html"
-              }
-
-              // check if test passed
-              sh "./ci-scripts/colosseum_scripts/check-results.sh results/test_summary.html"
-
-              sh "rm -Rf ./results"
-            }
-          }
-        }
-      }
-    }
-    stage ("Set job status") {
-      steps {
-        lock (resource) {
-          script {
-            echo 'Set job status'
-            sh "./ci-scripts/colosseum_scripts/set-job-status.sh"
-          }
-        }
-      }
-    }
-  }
-}
--- a/ci-scripts/Jenkinsfile-nrue
+++ b/ci-scripts/Jenkinsfile-nrue
@@ -1,257 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_Credentials == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.EPC_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_Type == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-              if (fileExists("test_logs_CN.zip")){
-                sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip"
-                archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip"
-            }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -61,13 +61,6 @@ pipeline {
  }

  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
    stage ('Verify Parameters') {
      steps {
        script {
@@ -186,8 +179,6 @@ pipeline {
                if (fileExists(xmlFile)) {
                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
                }
              }
            }
@@ -201,9 +192,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -223,10 +212,6 @@ pipeline {
            // Zipping all archived log files
              sh "mkdir test_logs"
              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
              sh "rm -rf *test_log*/"
              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -76,7 +76,7 @@ pipeline {
          withCredentials([
            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
          ]) {
-            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
+            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup"]
            // Logging in on both registries
            sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -39,8 +39,10 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)

 // Terminate Status
 def termENB = 0
-def termStatusArray = new Boolean[termENB + 1]
+def termOAIUE = 1
+def termStatusArray = new Boolean[termOAIUE + 1]
 termStatusArray[termENB] = false
+termStatusArray[termOAIUE] = false

 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
@@ -64,13 +66,6 @@ pipeline {
    }

    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
@@ -192,8 +187,6 @@ pipeline {
                                if (fileExists(xmlFile)) {
                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                }
                            }
                        }
@@ -207,9 +200,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
@@ -241,6 +232,23 @@ pipeline {
                        }
                    }
                }
+                stage('Terminate OAI-UE') {
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate OAI-UE\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termOAIUE] = true
+                            }
+                        }
+                    }
+                }
            }
        }
        stage('Log Collection') {
@@ -287,7 +295,7 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
                        ]) {
                            echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"

                            echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
@@ -456,6 +464,13 @@ pipeline {
                        sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
                    }
                }
+                if (!termStatusArray[termOAIUE]) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                    }
+                }
            }
        }
    }
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -54,13 +54,6 @@ pipeline {
        lock(extra: lockResources)
    }
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
@@ -189,8 +182,6 @@ pipeline {
                                if (fileExists(xmlFile)) {
                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                }
                            }
                        }
@@ -205,9 +196,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                                if (fileExists(xmlFile)) {
                                    try {
-                                      timeout (time: 60, unit: 'MINUTES') {
                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                      }
                                    } catch (Exception e) {
                                        currentBuild.result = 'FAILURE'
                                        buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -200,8 +200,6 @@ pipeline {
                if (fileExists(xmlFile)) {
                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                  echo "Test XML file     :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
                }
              }
            }
@@ -217,9 +215,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -276,7 +272,7 @@ pipeline {
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
            ]) {
              echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"

              echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
              sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -66,14 +66,32 @@ pipeline {
        ansiColor('xterm')
        lock(extra: lockResources)
    }
+    // the following parameter options are commented out so it shows the ones
+    // that you SHALL have to run the job.
+    // You can use them as template
+    /*
+    parameters {
+        //node-test parameters
+        string(name: 'pythonExecutor', defaultValue: 'nodea', description: 'Node where the pipeline - python scripts will be executed')
+        string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
+        string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
+        booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
+        string(name: 'lockResources', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
+
+        //eNB parameters
+        string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
+        credentials(name: 'eNB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for eNB')
+        string(name: 'eNB_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of eNB source code')
+
+        //EPC parameters
+        string(name: 'EPC_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of EPC')
+        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
+        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
+        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
+    }
+    */
+
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
@@ -181,8 +199,6 @@ pipeline {
                                if (fileExists(xmlFile)) {
                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                }
                            }
                        }
@@ -195,9 +211,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -0,0 +1,264 @@
+#!/bin/groovy
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
+
+// Location of the python executor node shall be in the same subnet as the others servers
+def pythonExecutor = params.pythonExecutor
+
+// Location of the test XML file to be run
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+
+// Name of the test stage
+def testStageName = params.pipelineTestStageName
+
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
+
+// Terminate Status
+def termUE = 0
+def termENB = 1
+def termSPGW = 2
+def termMME = 3
+def termHSS = 4
+def termStatusArray = new Boolean[termHSS + 1]
+termStatusArray[termUE] = false
+termStatusArray[termENB] = false
+termStatusArray[termSPGW] = false
+termStatusArray[termMME] = false
+termStatusArray[termHSS] = false
+
+// Global Parameters. Normally they should be populated when the master job
+// triggers the slave job with parameters
+def eNB_Repository
+def eNB_Branch
+def eNB_CommitID
+def eNB_AllowMergeRequestProcess = false
+def eNB_TargetBranch
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    options {
+        ansiColor('xterm')
+        lock(extra: lockResources)
+    }
+    stages {
+        stage ("Verify Parameters") {
+            steps {
+                script {
+                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
+                    def allParametersPresent = true
+
+                    // It is already to late to check it
+                    if (params.pythonExecutor != null) {
+                        echo "eNB CI executor node  :   ${pythonExecutor}"
+                    }
+                    // If not present picking a default Stage Name
+                    if (params.pipelineTestStageName == null) {
+                        // picking default
+                        testStageName = 'Template Test Stage'
+                    }
+
+                    if (params.LockResources == null) {
+                      echo "no LockResources given"
+                      allParametersPresent = false
+                    }
+                    if (params.UE_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.UE_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.UE_Credentials == null) {
+                        allParametersPresent = false
+                    }
+                    // the following 4 parameters should be pushed by the master trigger
+                    // if not present, take the job GIT variables (used for developing)
+                    if (params.eNB_Repository == null) {
+                        eNB_Repository = env.GIT_URL
+                    } else {
+                        eNB_Repository = params.eNB_Repository
+                    }
+                    echo "eNB_Repository        :   ${eNB_Repository}"
+                    if (params.eNB_Branch == null) {
+                        eNB_Branch = env.GIT_BRANCH
+                    } else {
+                        eNB_Branch = params.eNB_Branch
+                    }
+                    echo "eNB_Branch            :   ${eNB_Branch}"
+                    if (params.eNB_CommitID == null) {
+                        eNB_CommitID = env.GIT_COMMIT
+                    } else {
+                        eNB_CommitID = params.eNB_CommitID
+                    }
+                    echo "eNB_CommitID          :   ${eNB_CommitID}"
+                    if (params.eNB_mergeRequest != null) {
+                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
+                        if (eNB_AllowMergeRequestProcess) {
+                            if (params.eNB_TargetBranch != null) {
+                                eNB_TargetBranch = params.eNB_TargetBranch
+                            } else {
+                                eNB_TargetBranch = 'develop'
+                            }
+                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
+                        }
+                    }
+/*
+                    if (params.EPC_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Type == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Credentials == null) {
+                        allParametersPresent = false
+                    }
+*/
+                    if (allParametersPresent) {
+                        echo "All parameters are present"
+                        if (eNB_AllowMergeRequestProcess) {
+                            sh "git fetch"
+                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
+                        } else {
+                            sh "git fetch"
+                            sh "git checkout -f ${eNB_CommitID}"
+                        }
+                    } else {
+                        echo "Some parameters are missing"
+                        sh "./ci-scripts/fail.sh"
+                    }
+                }
+            }
+        }
+        stage ("Build and Test") {
+            steps {
+                script {
+                    dir ('ci-scripts') {
+                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                        // If not present picking a default XML file
+                        if (params.pythonTestXmlFile == null) {
+                            // picking default
+                            testXMLFile = 'xml_files/ue_band20_build.xml'
+                            echo "Test XML file(default):   ${testXMLFile}"
+                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
+                        } else {
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                                if (fileExists(xmlFile)) {
+                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                                    echo "Test XML file         :   ${xmlFile}"
+                                }
+                            }
+                        }
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
+                        ]) {
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                            if (fileExists(xmlFile)) {
+                                try {
+                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                } catch (Exception e) {
+                                    currentBuild.result = 'FAILURE'
+                                    buildStageStatus = false
+                                }
+                            }
+                            }
+                            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                        }
+                    }
+                }
+            }
+        }
+        stage('Log Collection') {
+            parallel {
+                stage('Log Collection (OAI UE - Build)') {
+                    steps {
+                        echo '\u2705 \u001B[32mLog Collection (OAI UE - Build)\u001B[0m'
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (UE - Build)\u001B[0m'
+                            sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (OAI UE - Run)') {
+                    steps {
+                        echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (UE - Run)\u001B[0m'
+                            sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("ue.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "ue.log.${env.BUILD_ID}.zip"
+                            }
+                            if(fileExists("ci-scripts/test_results.html")) {
+                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
+                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
+                                archiveArtifacts "test_results-${JOB_NAME}.html"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        always {
+            script {
+                if (params.pipelineZipsConsoleLog != null) {
+                    if (params.pipelineZipsConsoleLog) {
+                        echo "Archiving Jenkins console log"
+                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
+                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
+                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
+                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/ci-scripts/Jenkinsfile-trig-nsa
+++ b/ci-scripts/Jenkinsfile-trig-nsa
@@ -0,0 +1,160 @@
+#!/bin/groovy
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+// necessary for reading JSON
+import groovy.json.JsonSlurper
+
+// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
+
+// Location of the python executor node shall be in the same subnet as the others servers
+def pythonExecutor = params.pythonExecutor
+
+def TARGET_BRANCH = "develop"
+def ALLOW_MERGE = true
+def GitPostArgs = ''
+def jobStatus
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    stages {
+        stage ("Launcher") {
+            steps {
+                script {
+                    // retrieve MR that are opened nd with tag NSA
+                    MR_LIST = sh returnStdout: true, script: 'curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests?state=opened&per_page=100&labels=NSA" | jq -cj "[.[].iid]"'
+                    echo "List of selected MRs: ${MR_LIST.trim()}"
+                    def MR_ARRAY = new JsonSlurper().parseText(MR_LIST.trim())
+                    // for every selected MR, retrieve the branch name and the latest commit
+                    for (MR in MR_ARRAY) {
+                        SRC_BRANCH=sh returnStdout: true, script: """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".source_branch" || true """
+                        SRC_BRANCH=SRC_BRANCH.trim()
+                        COMMIT_ID=sh returnStdout: true, script:  """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".sha" || true """
+                        COMMIT_ID=COMMIT_ID.trim()
+                        echo "Testing NSA on : ${MR} ${SRC_BRANCH} ${COMMIT_ID}"
+                        commit = COMMIT_ID.replace("\"","")
+                        GitPostArgs = MR + ' ' + commit + ' '
+                        echo GitPostArgs
+
+                        //calling LTE 2x2
+                        jobName = "RAN-LTE-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA B200
+                        jobName = "RAN-NSA-B200-Module-LTEBOX"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA 2x2
+                        jobName = "RAN-NSA-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling SA 
+                        jobName = "RAN-SA-Module-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling SA-AmariS
+                        jobName = "RAN-SA-AmariS-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling OAIUE N310-X300
+                        jobName = "RAN-SA-OAIUE-N310-X300-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //git report the test results in 1 block, at the end of the test sequence of one MR
+                        dir ('ci-scripts/ran_dashboard') {
+                            sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
+                        }                        
+                    }
+                }                                  
+            }   
+        }
+    }
+}
+
+
--- a/ci-scripts/active_net_interfaces.awk
+++ b/ci-scripts/active_net_interfaces.awk
@@ -18,7 +18,4 @@
 # * For more information about the OpenAirInterface (OAI) Software Alliance:
 # *      contact@openairinterface.org
 # */
-
-add_subdirectory(nr_rlc)
-add_subdirectory(nr_pdcp)
-add_subdirectory(NR_MAC_UE)
+/inet.*brd/{print "interfaceToUse="$NF"done"}
--- a/ci-scripts/add_user_to_conf_file.awk
+++ b/ci-scripts/add_user_to_conf_file.awk
@@ -0,0 +1,33 @@
+BEGIN{lineIdx=0;captureUEDesc=0}
+{
+    if ($0 ~/UE0/) {
+        captureUEDesc = 1
+    }
+    if (captureUEDesc == 1) {
+        captureLine[lineIdx] = $0
+        lineIdx = lineIdx + 1
+    }
+    print $0
+}
+END {
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       print ""
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UE0/) {
+               mLine = captureLine[k]
+               gsub("UE0", "UE"ueIdx, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/MSIN=/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%08d", 1111+int(ueIdx))
+                   gsub("00001111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+
+       }
+   }
+}
--- a/ci-scripts/add_user_to_subscriber_list.awk
+++ b/ci-scripts/add_user_to_subscriber_list.awk
@@ -0,0 +1,27 @@
+BEGIN{lineIdx=0}
+{
+    captureLine[lineIdx] = $0
+    lineIdx = lineIdx + 1
+    print $0
+}
+END{
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UserName=/) {
+               mLine = captureLine[k]
+               MSIN=sprintf("%08d", 1111+int(ueIdx))
+               gsub("00001111", MSIN, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/SubscriptionIndex/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%d", 111+int(ueIdx))
+                   gsub("111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+       }
+   }
+}
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -220,13 +220,21 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            EPC.SourceCodePath=matchReg.group(1)
        elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE) or re.match('OC-OAI-CN5G', matchReg.group(1), re.IGNORECASE):
+            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE) or re.match('OC-OAI-CN5G', matchReg.group(1), re.IGNORECASE):
                EPC.Type=matchReg.group(1)
            else:
-                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-Docker or OC-OAI-CN5G)')
+                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker or OC-OAI-CN5G)')
        elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
            EPC.ContainerPrefix=matchReg.group(1)
+        elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBIPAddress parameter")
+        elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBUserName parameter")
+        elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBType parameter")
+        elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBPassword parameter")
        elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
            CiTestObj.testXMLfiles.append(matchReg.group(1))
--- a/ci-scripts/as_ue/aw2s-multi-00102-20.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-00102-20.cfg
@@ -1,284 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define N_ANTENNA_UL 1
-#define DL_ARFCN 631296
-#define TDD 1
-
-log_options: "all.level=warn,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 */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver_20/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      ldpc_max_its:8,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-      global_timing_advance:-1,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "001020000000001",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "001020000000002",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "001020000000003",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "001020000000004",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "001020000000005",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "001020000000006",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "001020000000007",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "001020000000008",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "001020000000009",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "001020000000010",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "001020000000011",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "001020000000012",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "001020000000013",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "001020000000014",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "001020000000015",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "001020000000016",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}
--- a/ci-scripts/as_ue/aw2s-multi-00102-2x2-v2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-00102-2x2-v2.cfg
@@ -4,8 +4,6 @@
 */
 {
 #define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
-#define DL_ARFCN 631296
 #define TDD 1

 log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
@@ -18,7 +16,7 @@ include "rf_driver/1chan.cfg",

 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
-
+                    
  cell_groups: [{
      group_type: "nr",
      multi_ue: true,
@@ -26,21 +24,21 @@ allow dynamic UE creation from remote API */
      rf_port: 0,
      bandwidth: 20,
      band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
      subcarrier_spacing: 30,
      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
+      n_antenna_ul: 1,
      rx_to_tx_latency:2,
    }],
  }],

  /* UE capabilities */
-  /* USIM data */
+  /* USIM data */     
  ue_list: [
    {
      "ue_id" : 1,
-      "imsi": "001020000000001",
+      "imsi": "208970000000111",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -55,7 +53,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 2,
-      "imsi": "001020000000002",
+      "imsi": "208970000000112",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -70,7 +68,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 3,
-      "imsi": "001020000000003",
+      "imsi": "208970000000113",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -85,7 +83,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 4,
-      "imsi": "001020000000004",
+      "imsi": "208970000000114",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -100,7 +98,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 5,
-      "imsi": "001020000000005",
+      "imsi": "208970000000115",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -115,7 +113,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 6,
-      "imsi": "001020000000006",
+      "imsi": "208970000000116",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -130,7 +128,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 7,
-      "imsi": "001020000000007",
+      "imsi": "208970000000117",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -145,7 +143,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 8,
-      "imsi": "001020000000008",
+      "imsi": "208970000000118",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -160,7 +158,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 9,
-      "imsi": "001020000000009",
+      "imsi": "208970000000119",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -175,7 +173,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 10,
-      "imsi": "001020000000010",
+      "imsi": "208970000000120",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -190,7 +188,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 11,
-      "imsi": "001020000000011",
+      "imsi": "208970000000121",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -205,7 +203,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 12,
-      "imsi": "001020000000012",
+      "imsi": "208970000000122",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -220,7 +218,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 13,
-      "imsi": "001020000000013",
+      "imsi": "208970000000123",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -235,7 +233,7 @@ allow dynamic UE creation from remote API */
    },
        {
      "ue_id" : 14,
-      "imsi": "001020000000014",
+      "imsi": "208970000000124",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -250,7 +248,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 15,
-      "imsi": "001020000000015",
+      "imsi": "208970000000125",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -265,7 +263,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 16,
-      "imsi": "001020000000016",
+      "imsi": "208970000000126",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
--- a/ci-scripts/build_fr1_from_yaml.py
+++ b/ci-scripts/build_fr1_from_yaml.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Jul  7 23:04:51 2020
+
+@author: hardy
+"""
+
+
+
+import yaml
+import sys
+import subprocess
+
+      
+
+def main():
+  f_yaml=sys.argv[1]
+  f_sh=sys.argv[2]
+  #filename='py_params_template.yaml'
+  with open(f_yaml,'r') as file:
+    # The FullLoader parameter handles the conversion from YAML
+    # scalar values to Python the dictionary format
+    print('Loading '+f_yaml)
+    params = yaml.load(file,Loader=yaml.FullLoader)
+
+
+  with open(f_sh,'w') as f:
+    f.write('#!/bin/sh\n')
+    for i in range (0, len(params['steps'])):
+      step=params['steps'][i].split(',')
+      mode=step[0]
+      f_xml=step[1]
+      line='python3 main.py ' + \
+           '--mode='+ mode + ' ' + \
+           '--ranRepository=' + params['ranRepository'] + ' ' + \
+           '--ranBranch=' + params['ranBranch'] + ' ' + \
+           '--ranCommitID=' + params['ranCommitID'] + ' ' + \
+           '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
+           '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
+           \
+           '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
+           '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
+           '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
+           '--UESourceCodePath=' + params['UE']['UESourceCodePath'] + ' ' + \
+           \
+           '--EPCIPAddress=' + params['EPC']['EPCIPAddress'] + ' ' + \
+           '--EPCUserName=' + params['EPC']['EPCUserName'] + ' ' + \
+           '--EPCPassword=' + params['EPC']['EPCPassword'] + ' ' + \
+           '--EPCSourceCodePath=' + params['EPC']['EPCSourceCodePath'] + ' ' + \
+           '--EPCType=' + params['EPC']['EPCType'] + ' ' + \
+           \
+           '--eNBIPAddress=' + params['RAN'][0]['eNBIPAddress'] + ' ' + \
+           '--eNBUserName=' + params['RAN'][0]['eNBUserName'] + ' ' + \
+           '--eNBPassword=' + params['RAN'][0]['eNBPassword'] + ' ' + \
+           '--eNBSourceCodePath=' + params['RAN'][0]['eNBSourceCodePath'] + ' ' + \
+           \
+           '--eNB1IPAddress=' + params['RAN'][1]['eNB1IPAddress'] + ' ' + \
+           '--eNB1UserName=' + params['RAN'][1]['eNB1UserName'] + ' ' + \
+           '--eNB1Password=' + params['RAN'][1]['eNB1Password'] + ' ' + \
+           '--eNB1SourceCodePath=' + params['RAN'][1]['eNB1SourceCodePath'] + ' '
+      if mode!="InitiateHtml":
+         line+='--XMLTestFile=' + f_xml
+      #if mode is InitiateHTML we have a special processing to mention all xml files from the list
+      #loop starting at 1 to avoid the xml file mentioned with InitiateHtml in yaml file (file is none)
+      else:
+         for i in range (1, len(params['steps'])):
+            step=params['steps'][i].split(',')
+            f_xml=step[1]
+            line+='--XMLTestFile=' + f_xml+' '
+      line+='\n'
+      print(line)
+      f.write(line)
+  subprocess.call(['chmod','777',f_sh])
+
+if __name__ == "__main__":
+    main()
+
+
--- a/ci-scripts/build_fr1_template.yaml
+++ b/ci-scripts/build_fr1_template.yaml
@@ -0,0 +1,40 @@
+
+ranRepository : https://gitlab.eurecom.fr/oai/openairinterface5g.git
+ranBranch : integration_2021_wk13_a  
+ranCommitID : 104aa7eed5d6702c1b9da663414079ef698da206     
+ranAllowMerge : 'yes' 
+ranTargetBranch : develop
+
+steps:
+  - InitiateHtml,none
+  - TesteNB,xml_files/fr1_multi_node_build.xml
+  - TesteNB,xml_files/fr1_epc_start.xml
+  - TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
+  - TesteNB,xml_files/fr1_epc_closure.xml
+
+RAN:
+    - eNBIPAddress : 192.168.18.199 #eNB on Minimassive
+      eNBUserName : oaicicd
+      eNBPassword : HzB*nkryaITdVd08TKlT#2Z5a!7M#~qn
+      eNBSourceCodePath : /tmp/CI-FR1-eNB
+    - eNB1IPAddress : 192.168.18.198 #gNB on Mozart
+      eNB1UserName : oaicicd
+      eNB1Password : 7zkDOFgh@w3HvRBMPTMh@BAx
+      eNB1SourceCodePath : /tmp/CI-FR1-gNB
+
+
+EPC: #on Nikaia 
+  EPCIPAddress : 192.168.18.99
+  EPCUserName : nikaia
+  EPCPassword : linux
+  EPCSourceCodePath : /tmp/CI-FR1-EPC
+  EPCType : ltebox
+
+
+UE:
+  UEIPAddress : none
+  UEUserName : none
+  UEPassword : none
+  UESourceCodePath : none
+
+
--- a/ci-scripts/checkAddedWarnings.sh
+++ b/ci-scripts/checkAddedWarnings.sh
@@ -106,11 +106,11 @@ echo "Merged Commit is    : $MERGE_COMMMIT"
 echo "Target Init   is    : $TARGET_INIT_COMMIT"

 # Retrieve the list of modified files since the latest develop commit
-MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | grep -E "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
+MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_WARNINGS_FILES=0

 # Retrieve list of warnings 
-LIST_WARNING_FILES=`grep -E "error:|warning:" archives/*/*.txt | grep -E -v "jobserver unavailable|Clock skew detected." | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
+LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.txt | egrep -v "jobserver unavailable|Clock skew detected." | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`

 echo ""
 echo "List of files that have been modified by the Merge Request AND"
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/ci-scripts/checkCodingFormattingRules.sh
@@ -64,19 +64,18 @@ then
    awk '/#[ \t]*ifndef/ { gsub("^.*ifndef *",""); if (names[$1]!="") print "files with same {define ", FILENAME, names[$1]; names[$1]=FILENAME } /#[ \t]*define/ { gsub("^.*define *",""); if(names[$1]!=FILENAME) print "error in declaration", FILENAME, $1, names[$1]; nextfile }' `find openair* common targets executables -name *.h |grep -v LFDS` > header-files-w-incorrect-define.txt

    # Testing if explicit GNU GPL license banner
-    grep -E -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "General Public License" . | grep -E -v "openair3/NAS/COMMON/milenage.h" > files-w-gnu-gpl-license-banner.txt
+    egrep -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "General Public License" . | egrep -v "openair3/NAS/COMMON/milenage.h" > files-w-gnu-gpl-license-banner.txt

    # Looking at exotic/suspect banner
-    LIST_OF_FILES_W_BANNER=`grep -E -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "Copyright|copyleft" .`
+    LIST_OF_FILES_W_BANNER=`egrep -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "Copyright|copyleft" .`
    if [ -f ./files-w-suspect-banner.txt ]; then rm -f ./files-w-suspect-banner.txt; fi
    for FILE in $LIST_OF_FILES_W_BANNER
    do
-       IS_NFAPI=`echo $FILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
-       IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FILE || true`
-       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
-       IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FILE || true`
-       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+       IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
+       IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
+       IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
+       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
       then
           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
           then
@@ -147,7 +146,7 @@ echo " ----------------------------------------------------------"
 echo ""

 # Retrieve the list of modified files since the latest develop commit
-MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | grep -E "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
+MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_TO_FORMAT=0
 if [ -f header-files-w-incorrect-define.txt ]
 then
@@ -173,21 +172,20 @@ do
    if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
    then
        # Testing if explicit GNU GPL license banner
-        GNU_EXCEPTION=`echo $FULLFILE | grep -E -c "openair3/NAS/COMMON/milenage.h" || true`
+        GNU_EXCEPTION=`echo $FULLFILE | egrep -c "openair3/NAS/COMMON/milenage.h" || true`
        if [ $GNU_EXCEPTION -eq 0 ]
        then
-            grep -E -il "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
+            egrep -il "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
        fi
        # Looking at exotic/suspect banner
-        IS_BANNER=`grep -E -i -c "Copyright|copyleft" $FULLFILE || true`
+        IS_BANNER=`egrep -i -c "Copyright|copyleft" $FULLFILE || true`
        if [ $IS_BANNER -ne 0 ]
        then
-            IS_NFAPI=`echo $FULLFILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
-            IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FULLFILE || true`
-            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
-            IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+            IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
+            IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
+            IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
+            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
            then
                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                then
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -1,415 +0,0 @@
-idefix:
-  Host: idefix
-  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
-  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-  Trace: True
-  LogStore: /media/usb-drive/ci_qlogs
-
-up2:
-  Host: up2
-  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-up2-fhi72:
-  Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-up2-aerial:
-  Host: up2
-  AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-adb_ue_1:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate R3CM40LZPHT
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach R3CM40LZPHT
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach R3CM40LZPHT
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT
-  DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable"
-  DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable"
-  NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
-  CmdPrefix: adb -s R3CM40LZPHT shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_1-logs
-adb_ue_2:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
-  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
-  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
-  NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
-  CmdPrefix: adb -s 5200c00db4413517 shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_2-logs
-
-oc-cn5g:
-  Host: avra
-  Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
-  NetworkScript: echo "inet 172.21.6.102"
-  RunIperf3Server: False
-
-oc-cn5g-20897:
-  Host: cacofonix
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-
-matix-cn5g:
-  Host: matix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-porcepix-cn4g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-porcepix-cn5g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-nano-cn4g:
-  Host: nano
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-ltebox-nano:
-  Host: nano
-  NetworkScript: ip a show dev tun1
-
-sabox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-ltebox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-amarisoft_ue:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_2x2:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_fhi72:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_1:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue1
-  MTU: 1500
-amarisoft_ue_2:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
-  NetworkScript: ip netns exec ue2 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue2
-  MTU: 1500
-amarisoft_ue_3:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
-  NetworkScript: ip netns exec ue3 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue3
-  MTU: 1500
-amarisoft_ue_4:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
-  NetworkScript: ip netns exec ue4 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue4
-  MTU: 1500
-amarisoft_ue_5:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
-  NetworkScript: ip netns exec ue5 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue5
-  MTU: 1500
-amarisoft_ue_6:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
-  NetworkScript: ip netns exec ue6 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue6
-  MTU: 1500
-amarisoft_ue_7:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
-  NetworkScript: ip netns exec ue7 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue7
-  MTU: 1500
-amarisoft_ue_8:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
-  NetworkScript: ip netns exec ue8 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue8
-  MTU: 1500
-amarisoft_ue_9:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
-  NetworkScript: ip netns exec ue9 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue9
-  MTU: 1500
-amarisoft_ue_10:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
-  NetworkScript: ip netns exec ue10 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue10
-  MTU: 1500
-amarisoft_ue_11:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
-  NetworkScript: ip netns exec ue11 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue11
-  MTU: 1500
-amarisoft_ue_12:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
-  NetworkScript: ip netns exec ue12 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue12
-  MTU: 1500
-amarisoft_ue_13:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
-  NetworkScript: ip netns exec ue13 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue13
-  MTU: 1500
-amarisoft_ue_14:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
-  NetworkScript: ip netns exec ue14 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue14
-  MTU: 1500
-amarisoft_ue_15:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
-  NetworkScript: ip netns exec ue15 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue15
-  MTU: 1500
-amarisoft_ue_16:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
-  NetworkScript: ip netns exec ue16 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue16
-  MTU: 1500
-
-oai_ue_caracal:
-  Host: caracal
-  AttachScript: 'docker start oai-nr-ue'
-  DetachScript: 'docker stop oai-nr-ue'
-  NetworkScript: ip a show dev oaitun_ue1
-  IF: oaitun_ue1
-  MTU: 1500
-
-lte_oai_ue_carabe:
-  Host: carabe
-  NetworkScript: docker exec lte-b200-ue-fdd-10Mhz-tm1 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec lte-b200-ue-fdd-10Mhz-tm1
-  IF: oaitun_ue1
-  MTU: 1500
-
-rfsim5g_gnb_nos1:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
-  CmdPrefix: docker exec rfsim5g-oai-gnb
-  IF: oaitun_enb1
-
-rfsim5g_ue:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
-
-rfsim5g_ue2:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue2
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue2
-  DetachScript: docker stop rfsim5g-oai-nr-ue2
-  MTU: 1500
-
-rfsim5g_ue3:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue3
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue3
-  DetachScript: docker stop rfsim5g-oai-nr-ue3
-  MTU: 1500
-
-rfsim5g_ue4:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue4
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue4
-  DetachScript: docker stop rfsim5g-oai-nr-ue4
-  MTU: 1500
-
-rfsim5g_ue5:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue5
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue5
-  DetachScript: docker stop rfsim5g-oai-nr-ue5
-  MTU: 1500
-
-rfsim5g_ue6:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue6
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue6
-  DetachScript: docker stop rfsim5g-oai-nr-ue6
-  MTU: 1500
-
-rfsim5g_ue7:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue7
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue7
-  DetachScript: docker stop rfsim5g-oai-nr-ue7
-  MTU: 1500
-
-rfsim5g_ue8:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue8
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue8
-  DetachScript: docker stop rfsim5g-oai-nr-ue8
-  MTU: 1500
-
-rfsim5g_ue9:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue9
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue9
-  DetachScript: docker stop rfsim5g-oai-nr-ue9
-  MTU: 1500
-
-rfsim5g_ue10:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue10
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue10
-  DetachScript: docker stop rfsim5g-oai-nr-ue10
-  MTU: 1500
-
-rfsim5g_ext_dn:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec rfsim5g-oai-ext-dn
-
-rfsim4g_ue:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim4g-oai-lte-ue0
-  DetachScript: docker stop rfsim4g-oai-lte-ue0
-  MTU: 1500
-
-rfsim4g_ext_dn:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec rfsim4g-trf-gen
-
-rfsim4g_enb_nos1:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enb1
-
-rfsim4g_enb_fembms:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enm1
-
-rfsim4g_ue_fembms:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_uem1
-
-l2sim5g_ue:
-  Host: "%%current_host%%"
-  AttachScript: docker start l2sim-oai-nr-ue0
-  DetachScript: docker stop l2sim-oai-nr-ue0
-  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec l2sim-oai-nr-ue0
-  IF: oaitun_ue1
-  MTU: 1500
-
-l2sim5g_ext_dn:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec l2sim-oai-ext-dn
-
-l2sim4g_ue:
-  Host: "%%current_host%%"
-  AttachScript: docker start l2sim4g-oai-lte-ue1
-  DetachScript: docker stop l2sim4g-oai-lte-ue1
-  NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec l2sim4g-oai-lte-ue1
-  IF: oaitun_ue1
-  MTU: 1500
-
-l2sim4g_ext_dn:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec l2sim4g-trf-gen
-
-test:
-  Host: localhost
-  NetworkScript: echo "inet 127.0.0.1 mtu 1500"
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -0,0 +1,128 @@
+idefix:
+  Host: idefix
+  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  UENetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  Trace: True
+  LogStore: /media/usb-drive/ci_qlogs
+nrmodule2_quectel:
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  UENetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  LogStore: /media/ci_qlogs
+
+adb_ue_1:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate R3CM40LZPHT
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach R3CM40LZPHT
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach R3CM40LZPHT
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT
+  DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable"
+  DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable"
+  UENetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
+  CmdPrefix: adb -s R3CM40LZPHT shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_1-logs
+adb_ue_2:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
+  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
+  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
+  UENetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
+  CmdPrefix: adb -s 5200c00db4413517 shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_2-logs
+
+amarisoft_ue:
+  Host: amariue
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
+amarisoft_ue_1:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  UENetworkScript: ip netns exec ue1 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue1
+  MTU: 1500
+amarisoft_ue_2:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  UENetworkScript: ip netns exec ue2 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue2
+  MTU: 1500
+amarisoft_ue_3:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  UENetworkScript: ip netns exec ue3 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue3
+  MTU: 1500
+amarisoft_ue_4:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  UENetworkScript: ip netns exec ue4 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue4
+  MTU: 1500
+amarisoft_ue_5:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  UENetworkScript: ip netns exec ue5 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue5
+  MTU: 1500
+amarisoft_ue_6:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  UENetworkScript: ip netns exec ue6 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue6
+  MTU: 1500
+amarisoft_ue_7:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  UENetworkScript: ip netns exec ue7 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue7
+  MTU: 1500
+amarisoft_ue_8:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  UENetworkScript: ip netns exec ue8 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue8
+  MTU: 1500
+amarisoft_ue_9:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  UENetworkScript: ip netns exec ue9 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue9
+  MTU: 1500
+amarisoft_ue_10:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  UENetworkScript: ip netns exec ue10 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue10
+  MTU: 1500
+
+oai_ue_obelix:
+  Host: obelix
+  UENetworkScript: ip a show dev oaitun_ue1
+  IF: oaitun_ue1
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -41,18 +41,15 @@ import cls_cmd
 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
-OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr"
-CI_OC_RAN_NAMESPACE = "oaicicd-ran"
-CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
+OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"


 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 		HELP.GenericHelp(CONST.Version)
-		raise ValueError('Insufficient Parameter: no OC Credentials')
-	if OCRegistry.startswith("http") or OCRegistry.endswith("/"):
-		raise ValueError(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
+		sys.exit('Insufficient Parameter: no OC Credentials')
+	if OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and end on a slash /')
 	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
 	if ret.returncode != 0:
 		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
@@ -67,49 +64,6 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')

-def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
-	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Deployment failed')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
-def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run(f'rm -Rf {path}/logs')
-	cmd.run(f'mkdir -p {path}/logs')
-	logging.debug('OC OAI CN5G: Collecting log files to workspace')
-	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
-	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
-	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
-		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-		if not podName:
-			logging.debug(f'{ii} pod not found!')
-		else:
-			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
-	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
-	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
-	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Undeployment failed')
-		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""
@@ -118,8 +72,8 @@ class Cluster:
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
-		self.OCUrl = OCUrl
-		self.OCRegistry = OCRegistry
+		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 		self.ranRepository = ""
 		self.ranBranch = ""
 		self.ranCommitID = ""
@@ -127,7 +81,6 @@ class Cluster:
 		self.ranTargetBranch = ""
 		self.cmd = None
 		self.imageToPull = ''
-		self.testSvrId = None

 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -177,7 +130,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -241,30 +194,28 @@ class Cluster:
 		self.cmd.run(f'oc delete -f {filename}')

 	def PullClusterImage(self, HTML, RAN):
-		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
 		if self.imageToPull == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError('Insufficient Parameter')
-		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
+			HELP.EPCSrvHelp(self.imageToPull)
+			sys.exit('Insufficient eNB Parameters')
+		lIpAddr = self.eNBIPAddress
 		self.testCase_id = HTML.testCase_id
-		cmd = cls_cmd.getConnection(self.testSvrId)
-		logging.info(cmd.run('docker --version'))
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
+		cmd = cls_cmd.getConnection(lIpAddr)
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, self.OCProjectName)
 		if not succeeded:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False
 		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
 		if ret.returncode != 0:
-			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
+			logging.error(f'\u001B[1m Unable to access OC project {ocProjectName}\u001B[0m')
 			OC_logout(cmd)
 			cmd.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False
 		for image in self.imageToPull:
-			imagePrefix = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			imageTag = f"{image}:{tag}"
+			imagePrefix = f'{self.OCRegistry}{self.OCProjectName}'
+			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
 				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
@@ -282,19 +233,19 @@ class Cluster:
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
+			sys.exit('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
 		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError('Insufficient Parameter: no OC Credentials')
-		if self.OCRegistry.startswith("http") or self.OCRegistry.endswith("/"):
-			raise ValueError(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
+			sys.exit('Insufficient Parameter: no OC Credentials')
+		if self.OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /')

 		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
 		self.cmd = cls_cmd.RemoteCmd(lIpAddr)
@@ -302,7 +253,10 @@ class Cluster:
 		self.testCase_id = HTML.testCase_id

 		# Workaround for some servers, we need to erase completely the workspace
-		self.cmd.cd(lSourcePath)
+		if self.forcedWorkspaceCleanup:
+			self.cmd.run(f'rm -Rf {lSourcePath}')
+		cls_containerize.CreateWorkspace(self.cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
 		# to reduce the amount of data send to OpenShift, we
 		# manually delete all generated files in the workspace
 		self.cmd.run(f'rm -rf {lSourcePath}/cmake_targets/ran_build');
@@ -310,19 +264,13 @@ class Cluster:
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
-			branchName = self.ranBranch.replace('/','-')
-			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == 'develop':
-				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
+				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
@@ -358,7 +306,7 @@ class Cluster:
 			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
 			ranbase_job = self._start_build('ran-base')
 			attemptedImages += ['ran-base']
-			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 800)
+			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 600)
 			if not status: logging.error('failure during build of ran-base')
 			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
@@ -374,19 +322,19 @@ class Cluster:
 		if status:
 			self._recreate_is_tag('oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
 			self._recreate_bc('oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
 			physim_job = self._start_build('oai-physim')
 			attemptedImages += ['oai-physim']

 			self._recreate_is_tag('ran-build', imageTag, 'openshift/ran-build-is.yaml')
 			self._recreate_bc('ran-build', imageTag, 'openshift/ran-build-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
 			ranbuild_job = self._start_build('ran-build')
 			attemptedImages += ['ran-build']

 			self._recreate_is_tag('oai-clang', imageTag, 'openshift/oai-clang-is.yaml')
 			self._recreate_bc('oai-clang', imageTag, 'openshift/oai-clang-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel8.2')
 			clang_job = self._start_build('oai-clang')
 			attemptedImages += ['oai-clang']

@@ -401,22 +349,22 @@ class Cluster:
 		if status:
 			self._recreate_is_tag('oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
 			self._recreate_bc('oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
 			enb_job = self._start_build('oai-enb')
 			attemptedImages += ['oai-enb']

 			self._recreate_is_tag('oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
 			self._recreate_bc('oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
 			gnb_job = self._start_build('oai-gnb')
 			attemptedImages += ['oai-gnb']

 			self._recreate_is_tag('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-is.yaml')
 			self._recreate_bc('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
 			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
 			attemptedImages += ['oai-gnb-aw2s']

@@ -428,68 +376,33 @@ class Cluster:
 			self.cmd.run(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log')
 			self.cmd.run(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log')

-			self._recreate_is_tag('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-is.yaml')
-			self._recreate_bc('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nr-cuup.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nr-cuup.rhel9')
-			nr_cuup_job = self._start_build('oai-nr-cuup')
-			attemptedImages += ['oai-nr-cuup']
-
 			self._recreate_is_tag('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
 			self._recreate_bc('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
 			lteue_job = self._start_build('oai-lte-ue')
 			attemptedImages += ['oai-lte-ue']

 			self._recreate_is_tag('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
 			self._recreate_bc('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
 			nrue_job = self._start_build('oai-nr-ue')
 			attemptedImages += ['oai-nr-ue']

-			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 600)
-			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
+			wait = lteue_job is not None and nrue_job is not None and self._wait_build_end([lteue_job, nrue_job], 600)
+			if not wait: logging.error('error during build of lteUE/nrUE')
 			status = status and wait
 			# recover logs
-			self.cmd.run(f'oc logs {nr_cuup_job} &> cmake_targets/log/oai-nr-cuup.log')
 			self.cmd.run(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log')
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

-		if status:
-			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
-			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
-			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
-			attemptedImages += ['ran-build-fhi72']
-
-			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job')
-			status = status and wait
-			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
-		if status:
-			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
-			self._recreate_bc('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
-			attemptedImages += ['oai-gnb-fhi72']
-
-			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
-			if not wait: logging.error('error during build of gNB-fhi72')
-			status = status and wait
-			# recover logs
-			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
 		# split and analyze logs
 		imageSize = {}
 		for image in attemptedImages:
 			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
+			self.cmd.run(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log')
 			tag = imageTag if image != 'ran-base' else baseTag
 			size = self._get_image_size(image, tag)
 			if size <= 0:
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -31,26 +31,17 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import time
+import sys 

 SSHTIMEOUT=7

-def is_local(host):
-	return host is None or host.lower() in ["", "none", "localhost"]
-
 # helper that returns either LocalCmd or RemoteCmd based on passed host name
 def getConnection(host, d=None):
-	if is_local(host):
+	if host is None or host.lower() in ["", "none", "localhost"]:
 		return LocalCmd(d=d)
 	else:
 		return RemoteCmd(host, d=d)

-def runScript(host, path, timeout, parameters=None, redirect=None, silent=False):
-	if is_local(host):
-		return LocalCmd.exec_script(path, timeout, parameters, redirect, silent)
-	else:
-		return RemoteCmd.exec_script(host, path, timeout, parameters, redirect, silent)
-
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
@@ -66,10 +57,6 @@ class Cmd(metaclass=abc.ABCMeta):
 		if not silent:
 			logging.debug(f'cd {self.cwd}')

-	@abc.abstractmethod
-	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
-		return
-
 	@abc.abstractmethod
 	def run(self, line, timeout=300, silent=False):
 		return
@@ -99,45 +86,22 @@ class Cmd(metaclass=abc.ABCMeta):
 		return

 class LocalCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
 			logging.debug(f'Working dir is {self.cwd}')
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')

-	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
-		if redirect and not redirect.startswith("/"):
-			raise ValueError(f"redirect must be absolute, but is {redirect}")
-		c = f"{path} {parameters}" if parameters else path
-		if not redirect:
-			ret = sp.run(c, shell=True, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
-			ret.stdout = ret.stdout.decode('utf-8').strip()
-		else:
-			with open(redirect, "w") as f:
-				ret = sp.run(c, shell=True, timeout=timeout, stdout=f, stderr=f)
-			ret.args += f" &> {redirect}"
-			ret.stdout = ""
-		if not silent:
-			logging.info(f"local> {ret.args}")
-		return ret
-
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.info(f"local> {line}")
+			logging.info(line)
 		try:
 			if line.strip().endswith('&'):
 				# if we wait for stdout, subprocess does not return before the end of the command
 				# however, we don't want to wait for commands with &, so just return fake command
-				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5, executable='/bin/bash')
-				time.sleep(0.1)
+				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
 			else:
-				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout, executable='/bin/bash')
+				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
 			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		if ret.stdout is None:
@@ -154,50 +118,18 @@ class LocalCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout

-	def copyin(self, src, tgt, recursive=False):
-		if src[0] != '/' or tgt[0] != '/':
-			raise Exception(f'support only absolute file paths (src {src} tgt {tgt})!')
-		if src == tgt:
-			return # nothing to copy, file is already where it should go
-		opt = '-r' if recursive else ''
-		return self.run(f'cp {opt} {src} {tgt}').returncode == 0
+	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
+		self.run(f'cp -r {src} {tgt}')

-	def copyout(self, src, tgt, recursive=False):
-		return self.copyin(src, tgt, recursive)
-
-def PutFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.put(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while putting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
-
-def GetFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.get(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while getting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
+	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
+		self.run(f'cp -r {src} {tgt}')

 class RemoteCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, hostname, d=None):
 		cIdx = 0
-		self.hostname = hostname
-		self.client = RemoteCmd._ssh_init()
+		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
+		self.client = paramiko.SSHClient()
+		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
 		self.cwd = d
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
@@ -210,12 +142,6 @@ class RemoteCmd(Cmd):
 				cIdx +=1
 		raise Exception ("Error: max retries, did not connect to host")

-	def _ssh_init():
-		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
-		client = paramiko.SSHClient()
-		client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-		return client
-
 	def _lookup_ssh_config(hostname):
 		ssh_config = paramiko.SSHConfig()
 		user_config_file = os.path.expanduser("~/.ssh/config")
@@ -236,33 +162,9 @@ class RemoteCmd(Cmd):
 			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
 		return cfg

-	def exec_script(host, path, timeout, parameters=None, redirect=None, silent=False):
-		if redirect and not redirect.startswith("/"):
-			raise ValueError(f"redirect must be absolute, but is {redirect}")
-		p = parameters if parameters else ""
-		r = f"> {redirect}" if redirect else ""
-		if not silent:
-			logging.info(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
-		client = RemoteCmd._ssh_init()
-		cfg = RemoteCmd._lookup_ssh_config(host)
-		client.connect(**cfg)
-		bash_opt = 'BASH_XTRACEFD=1' # write bash set -x output to stdout, see bash(1)
-		stdin, stdout, stderr = client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
-		# open() the file f at path, read() it and write() it into the stdin of the bash -s cmd
-		with open(path) as f:
-			stdin.write(f.read())
-			stdin.close()
-		cmd = path
-		if parameters: cmd += f" {parameters}"
-		if redirect: cmd += f" &> {redirect}"
-		ret = sp.CompletedProcess(args=cmd, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
-		ret.stdout = ret.stdout.decode('utf-8').strip()
-		client.close()
-		return ret
-
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.info(f"ssh[{self.hostname}]> {line}")
+			logging.info(line)
 		if self.cwd:
 			line = f"cd {self.cwd} && {line}"
 		try:
@@ -271,7 +173,6 @@ class RemoteCmd(Cmd):
 				# however, we don't want to wait for commands with &, so just return fake command
 				self.client.exec_command(line, timeout = 5)
 				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
-				time.sleep(0.1)
 			else:
 				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
 				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
@@ -289,38 +190,36 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout

-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
-		logging.debug(f"copyout: local:{src} -> {self.hostname}:{tgt}")
+		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			with LocalCmd() as cmd:
-				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-					return False
-				if not PutFile(self.client, abstmpfile, abstmpfile):
-					return False
-				cmd.run(f"rm {abstmpfile}")
-				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.put(abstmpfile, abstmpfile)
+			sftp.close()
+			cmd.run(f"rm {abstmpfile}")
+			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return PutFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.put(src, tgt)
+			sftp.close()

-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
-		logging.debug(f"copyin: {self.hostname}:{src} -> local:{tgt}")
+		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-				return False
-			if not GetFile(self.client, abstmpfile, abstmpfile):
-				return False
+			self.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.get(abstmpfile, abstmpfile)
+			sftp.close()
 			self.run(f"rm {abstmpfile}")
-			with LocalCmd() as cmd:
-				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return GetFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.get(src, tgt)
+			sftp.close()
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
--- a/ci-scripts/cls_log_mgt.py
+++ b/ci-scripts/cls_log_mgt.py
@@ -0,0 +1,94 @@
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+#   Required Python Version
+#     Python 3.x
+#
+#---------------------------------------------------------------------
+
+#USAGE: 
+#	log=Log_Mgt(Username,IPAddress,Password,Path)
+#	log.LogRotation()
+
+
+
+import logging
+import re
+import subprocess
+import sshconnection
+
+class Log_Mgt:
+
+	def __init__(self,Username, IPAddress,Password,Path):
+		self.Username=Username
+		self.IPAddress=IPAddress
+		self.Password=Password
+		self.path=Path
+
+#-----------------$
+#PRIVATE# Methods$
+#-----------------$
+
+
+	def __CheckUsedSpace(self):
+		HOST=self.Username+'@'+self.IPAddress
+		COMMAND="df "+ self.path
+		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		result = ssh.stdout.readlines()
+		s=result[1].decode('utf-8').rstrip()#result[1] is the second line with the results we are looking for
+		used=s.split()[4] #get 4th field ex: 70%
+		m = re.match('^(\d+)\%',used)
+		if m is not None:
+			return int(m.group(1))
+
+	def __RemoveOldest(self, days):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.IPAddress, self.Username, self.Password)
+		COMMAND='echo ' + self.Password + ' | sudo -S find ' + self.path + ' -type f -mtime +' +  str(days) + ' -delete'
+		mySSH.command(COMMAND,'\$',20)
+		mySSH.close()
+
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+
+	def LogRotation(self):
+		doLoop = True
+		nbDays = 14
+		while doLoop and nbDays > 1:
+			used_space = self.__CheckUsedSpace() #avail space in target folder
+			if used_space > 80 :
+				logging.debug('\u001B[1;37;41m  Used Disk (' + str(used_space) + '%) > 80%, on '  + self.Username+'@'+self.IPAddress + '\u001B[0m')
+				logging.debug('\u001B[1;37;41m  Removing Artifacts older than ' + str(nbDays) + ' days \u001B[0m')
+				self.__RemoveOldest(nbDays)
+				nbDays -= 1
+			else:
+				logging.debug('Used Disk (' + str(used_space) + '%) < 80%, on '  + self.Username+'@'+self.IPAddress +', no cleaning required')
+				doLoop = False
+
+
+			
+
+
+
--- a/ci-scripts/cls_module_ue.py
+++ b/ci-scripts/cls_module_ue.py
@@ -25,34 +25,36 @@
 #---------------------------------------------------------------------

 #to use isfile
+import os
+import sys
 import logging
 #time.sleep
 import time
 import re
+import subprocess
+from datetime import datetime
 import yaml

+#for log rotation mgt
+import cls_log_mgt
 import cls_cmd

 class Module_UE:

-	def __init__(self, module_name, node=None, filename="ci_infra.yaml"):
+	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
 			if m is None:
 				raise Exception(f'no such module name "{module_name}" in "{filename}"')
 			self.module_name = module_name
-			self.host = m['Host'] if m['Host'] != "%%current_host%%" else None
-			if node is None and self.host is None:
-				raise Exception(f'node not provided when needed')
-			elif node is not None and self.host is None:
-				self.host = node
+			self.host = m['Host']
 			self.cmd_dict = {
 				"attach": m.get('AttachScript'),
 				"detach": m.get('DetachScript'),
 				"initialize": m.get('InitScript'),
 				"terminate": m.get('TermScript'),
-				"getNetwork": m.get('NetworkScript'),
+				"getNetwork": m.get('UENetworkScript'),
 				"check": m.get('CheckStatusScript'),
 				"dataEnable": m.get('DataEnableScript'),
 				"dataDisable": m.get('DataDisableScript'),
@@ -62,10 +64,7 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			self.runIperf3Server = m.get('RunIperf3Server', True)
-			self.namespace = m.get('Namespace')
-			self.cnPath = m.get('CNPath')
-			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
+			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')

 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -190,23 +189,40 @@ class Module_UE:
 	def getHost(self):
 		return self.host

-	def getNamespace(self):
-		return self.namespace
-
-	def getCNPath(self):
-		return self.cnPath
-
-	def getRunIperf3Server(self):
-		return self.runIperf3Server
-
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""

 	def _enableTrace(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#delete old artifacts
+		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
+		#start Trace, artifact is created in home dir
+		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
+		mySSH.close()

 	def _disableTrace(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		mySSH.command('echo ' + ' '  + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
+		mySSH.close()
+

 	def _logCollect(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
+		now=datetime.now()
+		now_string = now.strftime("%Y%m%d-%H%M")
+		source='ci_qlog'
+		destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
+		#qlog artifact is zipped into the target folder
+		mySSH.command('echo $USER; echo ' + ' '  + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
+		mySSH.close()
+		#post action : log cleaning to make sure enough space is reserved for the next run
+		Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
+		return destination
+
--- a/ci-scripts/cls_native.py
+++ b/ci-scripts/cls_native.py
@@ -1,64 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-
-import logging
-import re
-
-import cls_cmd
-import cls_oai_html
-import constants as CONST
-
-class Native():
-
-	def Build(test_case, HTML, host, directory, options):
-		logging.debug(f'Building on server: {host}')
-		HTML.testCase_id = test_case
-
-		with cls_cmd.getConnection(host) as ssh:
-			base = f"{directory}/cmake_targets"
-			ret = ssh.run(f"{base}/build_oai {options} > {base}/log/build_oai.log", timeout=900)
-			success = ret.returncode == 0
-			logs = ssh.run(f"cat {base}/log/build_oai.log", silent=True)
-			logging.debug(f"build finished with code {ret.returncode}, output:\n{logs.stdout}")
-
-			# create log directory, and copy build logs
-			target = f"{base}/build_log_{test_case}/"
-			ssh.run(f"mkdir -p {target}")
-			ssh.run(f"mv {base}/log/* {target}")
-
-			# check if build artifacts are there
-			# NOTE: build_oai should fail with exit code if it could not build, but it does not
-			build_dir = f"{base}/ran_build/build"
-			build_gnb = re.search('--gNB', options) is not None
-			if build_gnb:
-				success = success and ssh.run(f"ls {build_dir}/nr-softmodem").returncode == 0
-			build_enb = re.search('--eNB', options) is not None
-			if build_enb:
-				success = success and ssh.run(f"ls {build_dir}/lte-softmodem").returncode == 0
-
-		if success:
-			logging.info('\u001B[1m Building OAI Pass\u001B[0m')
-			HTML.CreateHtmlTestRow(options, 'OK', CONST.ALL_PROCESSES_OK)
-		else:
-			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
-		return success
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -31,12 +31,14 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
+import sys              # arg
 import re               # reg
 import fileinput
 import logging
 import os
 import time
 import subprocess
+from multiprocessing import Process, Lock, SimpleQueue

 import constants as CONST

@@ -63,6 +65,10 @@ class HTMLManagement():
 		self.htmlTabIcons = []
 		self.testXMLfiles = []

+		self.testUnstable = False
+		self.testMinStableId = '999999'
+		self.testStabilityPointReached = False
+
 		self.htmleNBFailureMsg = ''
 		self.htmlUEFailureMsg = ''

@@ -213,13 +219,20 @@ class HTMLManagement():

 	def CreateHtmlTabFooter(self, passStatus):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
+			testOkEvenIfUnstable = False
+			if self.testUnstable and not passStatus:
+				if self.testStabilityPointReached or self.testMinStableId == '999999':
+					testOkEvenIfUnstable = True
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan="3">Final Tab Status</th>\n')
 			if passStatus:
 				self.htmlFile.write('        <th bgcolor = "green" colspan="3"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
 			else:
-				self.htmlFile.write('        <th bgcolor = "red" colspan="3"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+				if testOkEvenIfUnstable:
+					self.htmlFile.write('        <th bgcolor = "orange" colspan="3"><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
+				else:
+					self.htmlFile.write('        <th bgcolor = "red" colspan="3"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
@@ -229,7 +242,10 @@ class HTMLManagement():
 				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
 				subprocess.run(cmd, shell=True)
 			else:
-				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
+				if testOkEvenIfUnstable:
+					cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-exclamation-sign\"><\/span>/' test_results.html"
+				else:
+					cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
 				subprocess.run(cmd, shell=True)
 		self.htmlFooterCreated = False

@@ -263,6 +279,14 @@ class HTMLManagement():
 			self.htmlFile.write('</html>\n')
 			self.htmlFile.close()

+	def CreateHtmlRetrySeparator(self, cntnumfails):
+		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
+			self.htmlFile = open('test_results.html', 'a')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.close()
+
 	def CreateHtmlTestRow(self, options, status, processesStatus, machine='eNB'):
 		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
 			return
@@ -413,19 +437,13 @@ class HTMLManagement():

 		for k in DataLog['Data']:
 			# TestRow 
-			avg = DataLog['Data'][k][0]
-			maxval = DataLog['Data'][k][1]
-			count = DataLog['Data'][k][2]
-			valnorm = float(DataLog['Data'][k][3])
-			dev = DataLog['DeviationThreshold'][k]
-			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
-				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
+			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
+				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			else:
-				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()

@@ -444,8 +462,6 @@ class HTMLManagement():
 				self.htmlFile.write(f'        <td bgcolor = "lightgreen" >{status}</td>\n')
 			elif (str(status) == 'KO'):
 				self.htmlFile.write(f'        <td bgcolor = "lightcoral" >{status}</td>\n')
-			elif str(status) == 'SKIP':
-				self.htmlFile.write(f'        <td bgcolor = "lightgray" >{status}</td>\n')
 			else:
 				addOrangeBK = True
 				self.htmlFile.write(f'        <td bgcolor = "orange" >{status}</td>\n')
@@ -453,8 +469,8 @@ class HTMLManagement():
 				self.htmlFile.write('        <td bgcolor = "orange" >')
 			else:
 				self.htmlFile.write('        <td>')
-			for i in infoList: # add custom style to have elements side-by-side to reduce need for vertical space
-				self.htmlFile.write(f'         <pre style="display: inline flow-root list-item; margin: 0 3px 0 3px; min-width: 24em;">{i}</pre>')
+			for i in infoList:
+				self.htmlFile.write(f'         <pre>{i}</pre>')

 			self.htmlFile.write('                </td>')
 			self.htmlFile.write('      </tr>\n')
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -33,10 +33,9 @@ import logging
 import sshconnection
 #to update the HTML object
 import cls_oai_html
-import cls_cmd
+from multiprocessing import SimpleQueue
 #for log folder maintenance
 import os
-import re

 class PhySim:
 	def __init__(self):
@@ -51,6 +50,7 @@ class PhySim:
 		self.ranCommitID= ""
 		self.ranAllowMerge= ""
 		self.ranTargetBranch= ""
+		self.exitStatus=0
 		self.forced_workspace_cleanup=False
 		#private attributes
 		self.__workSpacePath=''
@@ -63,7 +63,7 @@ class PhySim:
 #PRIVATE Methods
 #-----------------

-	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
@@ -82,46 +82,36 @@ class PhySim:
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')

 		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		return True
+		return HTML

-	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
-		thrs_KO = int(self.timethrs)
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
+		thrs_NOK = 500
+		thrs_KO = 1000
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
-		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
 		mySSH.close()
-		#parse results looking for encoder/decoder processing time values
-
+		#parse results looking for Decoding values
+		runResultsT1=[]
 		with open(self.__runLogFile) as g:
 			for line in g:
-				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
-				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
-				if res_dec is not None:
-					time = res_dec.group(1)
-					info = res_dec.group(0)
-					break
-				if res_enc is not None:
-					time = res_enc.group(1)
-					info = res_enc.group(0)
-					break
-
-		# In case the T2 board does work properly, there is no statistics
-		if res_enc is None and res_dec is None:
-			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
-			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-			return False
-
-		#once parsed move the local logfile to its folder
-		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-		success = float(time) < thrs_KO
-		if success:
+				if 'decoding time' in line:
+					runResultsT1.append(line)
+		info = runResultsT1[0][15:-13]
+		result = int(''.join(filter(str.isdigit, info)))/100
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+		if result < thrs_NOK:
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		else:
-			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
+		elif result > thrs_KO:
+			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
 			logging.error(error_msg)
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
-		return success
+			self.exitStatus = 1
+		else:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
+		return HTML

 	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
 		#retrieve run log file and store it locally
@@ -132,7 +122,8 @@ class PhySim:
 			error_msg = f'could not recover test result file {filename}'
 			logging.error(error_msg)
 			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
-			return False
+			self.exitStatus = 1
+			return HTML

 		PUSCH_OK = False
 		with open(self.__runLogFile) as f:
@@ -148,7 +139,8 @@ class PhySim:
 			error_msg = 'error: no "PUSCH test OK"'
 			logging.error(error_msg)
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
-		return PUSCH_OK
+			self.exitStatus = 1
+		return HTML

 	def __CheckBuild_PhySim(self, HTML, CONST):
 		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
@@ -163,11 +155,14 @@ class PhySim:
 		with open(self.__buildLogFile) as f:
 			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
 				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
-				return True
+				self.exitStatus=0
+				return HTML
 		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
 		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
 		HTML.CreateHtmlTabFooter(False)
-		return False
+		#exitStatus=1 will do a sys.exit in main
+		self.exitStatus = 1
+		return HTML


 #-----------------$
@@ -218,10 +213,13 @@ class PhySim:
 		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)

 		mySSH.close()
-		return __CheckBuild_PhySim(htmlObj,constObj)
+		#check build status and update HTML object
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckBuild_PhySim(htmlObj,constObj)
+		return lHTML


-	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
 		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
@@ -234,21 +232,28 @@ class PhySim:
 		#run and redirect the results to a log file
 		mySSH.command(self.__workSpacePath+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
 		mySSH.close()
-		return self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
+		#return updated HTML to main
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
+		return lHTML

-	def Run_T2Test(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
+	def Run_LDPCt1Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
-		os.system(f'mkdir -p ./{self.__runLogPath}')
+		os.system('mkdir -p ./'+self.__runLogPath)
 		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile=f'physim_{str(testcase_id)}.log'
+		self.__runLogFile='physim_'+str(testcase_id)+'.log'
 		#open a session for test run
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
-		mySSH.run(f'cd {self.__workSpacePath}')
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command('cd '+self.__workSpacePath,'\$',5)
 		#run and redirect the results to a log file
-		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
 		mySSH.close()
-		return self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
+		#return updated HTML to main
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckResults_LDPCt1Test(htmlObj,constObj,testcase_id)
+		return lHTML

 	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
 		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
@@ -259,4 +264,6 @@ class PhySim:
 		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
 		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
 		mySSH.close()
-		return self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
+		#return updated HTML to main
+		lHTML = self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
+		return lHTML
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -65,7 +65,7 @@ class PhySim:
 #PUBLIC Methods$
 #-----------------$

-	def Deploy_PhySim(self, HTML):
+	def Deploy_PhySim(self, HTML, RAN):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
@@ -106,8 +106,7 @@ class PhySim:
 		if self.ranCommitID != '':
 			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
 		if self.ranAllowMerge:
-			branchName = self.ranBranch.replace('/','-')
-			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
 					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
@@ -123,7 +122,8 @@ class PhySim:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			mySSH.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug('\u001B[1m   Login to OC Cluster Successfully\u001B[0m')
 		mySSH.command(f'oc project {ocProjectName}', '\$', 30)
@@ -132,7 +132,8 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')

@@ -152,18 +153,19 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			self.AnalyzeLogFile_phySim()
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
 		count = 0
 		# Check whether the containers are in Running state or not under 2 mins
-		while(count < 5 and isRunning == False):
+		while(count < 2 and isRunning == False):
 			time.sleep(60)
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 23:
+			if (running_count + completed_count) == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())
@@ -183,7 +185,8 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PHYSIM_DEPLOY_FAIL)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
-			return False
+			RAN.prematureExit = True
+			return
 		# Waiting to complete the running test
 		count = 0
 		isFinished = False
@@ -210,7 +213,7 @@ class PhySim:
 		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/log/physim_test.txt', '.')
 		try:
-			listLogFiles =  subprocess.check_output('grep -E --colour=never "Execution Log file|Linux oai-" physim_test.txt', shell=True, universal_newlines=True)
+			listLogFiles =  subprocess.check_output('egrep --colour=never "Execution Log file|Linux oai-" physim_test.txt', shell=True, universal_newlines=True)
 			for line in listLogFiles.split('\n'):
 				res1 = re.search('Linux (?P<pod>oai-[a-zA-Z0-9\-]+) ', str(line))
 				res2 = re.search('Execution Log file = (?P<name>[a-zA-Z0-9\-\/\.\_\+]+)', str(line))
@@ -244,13 +247,13 @@ class PhySim:
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
 			logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
 		else:
+			RAN.prematureExit = True
 			if isFinished:
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
 			else:
 				HTML.CreateHtmlTestRow('Some test(s) timed-out!', 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
 			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-		return self.testStatus

 	def AnalyzeLogFile_phySim(self):
 		mySSH = SSH.SSHConnection()
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -36,13 +36,15 @@ import re               # reg
 import logging
 import os
 from pathlib import Path
+import time
+from multiprocessing import Process, Lock, SimpleQueue

 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_cmd

 #-----------------------------------------------------------
 # Class Declaration
@@ -93,30 +95,53 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		cmd.cd(lSourcePath)
-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
-		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
-		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
-		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+			else:
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 60)
+		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:bionic --file ci-scripts/docker/Dockerfile.cppcheck.bionic . > cmake_targets/log/cppcheck-bionic.txt 2>&1', '\$', 600)
+		mySSH.command('sed -e "s@xenial@focal@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.focal', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:focal --file ci-scripts/docker/Dockerfile.cppcheck.focal . > cmake_targets/log/cppcheck-focal.txt 2>&1', '\$', 600)
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 30)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
-		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()

+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
@@ -138,7 +163,7 @@ class StaticCodeAnalysis():
 				xmlStart = False
 				with open('./cppcheck-'+ variant + '.txt', 'r') as logfile:
 					for line in logfile:
-						ret = re.search('cppcheck version="(?P<version>[0-9\.]+)"', str(line))
+						ret = re.search('Unpacking cppcheck \((?P<version>[0-9\.]+)', str(line))
 						if ret is not None:
 						   CCR.versions[vId] = ret.group('version')
 						if re.search('RUN cat cmake_targets/log/cppcheck.xml', str(line)) is not None:
@@ -211,12 +236,12 @@ class StaticCodeAnalysis():
 		HTML.CreateHtmlTestRowCppCheckResults(CCR)
 		logging.info('\u001B[1m Static Code Analysis Pass\u001B[0m')

-		return True
+		return 0

 	def LicenceAndFormattingCheck(self, HTML):
-		# Workspace is no longer recreated from scratch.
-		# It implies that this method shall be called last within a build pipeline
-		# where workspace is already created
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		lIpAddr = self.eNBIPAddress
 		lUserName = self.eNBUserName
 		lPassWord = self.eNBPassword
@@ -226,30 +251,57 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id

-		check_options = ''
-		if self.ranAllowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
+		# on RedHat/CentOS .git extension is mandatory
+		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
+		if result is not None:
+			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
+		else:
+			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
+
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		argToPass = ''
+		if (self.ranAllowMerge):
+			argToPass = '--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH=' + self.ranBranch
 			if self.ranTargetBranch == '':
-				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
-					check_options += ' --build-arg TARGET_BRANCH=develop'
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+					argToPass += ' --build-arg TARGET_BRANCH=develop '
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+				argToPass += ' --build-arg TARGET_BRANCH=' + self.ranTargetBranch + ' '

-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker build --target oai-formatting-check --tag oai-formatting-check:latest ' + argToPass + '--file ci-scripts/docker/Dockerfile.formatting.bionic . > cmake_targets/log/oai-formatting-check.txt 2>&1', '\$', 600)

-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run('docker image prune --force')
-		cmd.run('docker volume prune --force')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker image prune --force', '\$', 60)
+		mySSH.command('docker volume prune --force', '\$', 60)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()
+
+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')

 		finalStatus = 0
 		if (os.path.isfile('./oai-formatting-check.txt')):
@@ -272,7 +324,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with incorrect define protection ===', str(line)) is not None:
 							circularHeaderDependency = True
 						if circularHeaderDependency:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								circularHeaderDependency = False
 							elif re.search('Running in|Files with incorrect define protection', str(line)) is not None:
 								pass
@@ -282,7 +334,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with a GNU GPL licence Banner ===', str(line)) is not None:
 							gnuGplLicence = True
 						if gnuGplLicence:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								gnuGplLicence = False
 							elif re.search('Running in|Files with a GNU GPL licence Banner', str(line)) is not None:
 								pass
@@ -292,7 +344,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with a suspect Banner ===', str(line)) is not None:
 							suspectLicence = True
 						if suspectLicence:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								suspectLicence = False
 							elif re.search('Running in|Files with a suspect Banner', str(line)) is not None:
 								pass
@@ -329,7 +381,7 @@ class StaticCodeAnalysis():
 					html_cell = f'Number of files not respecting: {len(gnuGplLicenceFiles)}\n'
 					for nFile in gnuGplLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', [html_cell])
+					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', html_queue)
 					del(html_cell)
 					finalStatus = -1

@@ -353,4 +405,4 @@ class StaticCodeAnalysis():
 			HTML.htmleNBFailureMsg = 'Could not access oai-formatting-check.txt file'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)

-		return finalStatus == 0
+		return finalStatus
--- a/ci-scripts/colosseum_scripts/README.md
+++ b/ci-scripts/colosseum_scripts/README.md
@@ -1,11 +0,0 @@
-# Colosseum Automated Testing
-
-These scripts are used by a Jenkins [job](../Jenkinsfile-colosseum) to trigger automated testing of OpenAirInterface (OAI) gNB and softUE on the [Colosseum](https://www.northeastern.edu/colosseum/) Open RAN digital twin.
-Once a test is triggered, a new OAI LXC container at the specified OAI version will be built on Colosseum (if not already present), and gNB and softUE will perform TCP uplink and downlink connectivity test via the iPerf [tool](https://iperf.fr/).
-The OAI branch to build and test can be specified through the `eNB_Branch` parameter passed through Jenkins (`eNB_TargetBranch`, which defaults to the `develop` branch, is used if `eNB_Branch` is not specified).
-The Colosseum network scenario to test is specified through the `Colosseum_Rf_Scenario` Jenkins parameter, which defaults to a base Colosseum scenario without artificially added channel effects (e.g., only hardware impariments of software-defined radios, cables, and channel emulator).
-
-Once the test ends, results are analyzed through the OAI automated test report generation tool available [here](https://github.com/ztouchnetworks/openairinterface-automated-test-reports), which builds a test report from the iPerf and OAI logs, and marks the test as successful or unsuccessful.
-Results from successful tests are saved in history files and used to compare more recent tests.
-A test is considered successful if the downlink throughput achieved during the test is greather than or equal to the average of the test history, which spans successful test executed since May 2024.
-This is used to identify possible regressions of OAI runs executed on the Colosseum testbed.
--- a/ci-scripts/conf_files/README.md
+++ b/ci-scripts/conf_files/README.md
@@ -29,8 +29,7 @@ Examples:
 - standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
 - gNB-CU: `gnb-cu.sa.f1.conf`
 - monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
+- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`

 Notes:
 - there is no need for TDD/FDD, this is encoded in the band number
--- a/ci-scripts/conf_files/untested/benetel-4g.conf
+++ b/ci-scripts/conf_files/untested/benetel-4g.conf
@@ -176,7 +176,12 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "yes";

@@ -189,7 +194,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.1";
--- a/ci-scripts/conf_files/untested/benetel-5g.conf
+++ b/ci-scripts/conf_files/untested/benetel-5g.conf
@@ -118,7 +118,9 @@ gNBs =
        hoppingId                                                   = 40;
        #p0_nominal                                                  = -90;
        p0_nominal                                                  = -118;
-
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
      ssb_PositionsInBurst_Bitmap                                   = 1; #0x80;

 # ssb_periodicityServingCell
@@ -164,7 +166,12 @@ gNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4  "CI_MME_IP_ADDR"; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///X2
    enable_x2 = "yes";
@@ -172,12 +179,19 @@ gNBs =
    tx2_reloc_overall = 2000;      /* unit: millisecond */
    t_dc_prep         = 1000;      /* unit: millisecond */
    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "127.0.0.1"; });
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "127.0.0.1";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );

    NETWORK_INTERFACES :
    {

+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        GNB_IPV4_ADDRESS_FOR_S1_MME              = "CI_GNB_IP_ADDR";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
        GNB_IPV4_ADDRESS_FOR_S1U                 = "CI_GNB_IP_ADDR";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
        GNB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.2/24";
--- a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 100;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -29;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 25;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -25;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 50;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -27;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 100;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 115;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -29;
+    max_rxgain                    = 115;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
--- a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 25;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 125;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -25;
+    max_rxgain                    = 125;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
--- a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 50;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 120;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -27;
+    max_rxgain                    = 120;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
--- a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf
@@ -173,7 +173,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///X2
    enable_x2 = "yes";
@@ -184,7 +190,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152

--- a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf
+++ b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf
@@ -354,7 +354,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -367,7 +373,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf
@@ -175,7 +175,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -188,7 +194,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
@@ -176,7 +176,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -188,7 +194,12 @@ eNBs =
    t_dc_overall      = 2000;      /* unit: millisecond */

    ///M2
-    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
+    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_enb_m2 = "yes";
    
@@ -208,7 +219,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -231,7 +244,12 @@ MCEs = (
            //M3
            enable_mce_m3 = "yes";

-            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
+            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );


            NETWORK_INTERFACES :
--- a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
@@ -1,214 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB_Eurecom_LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-
-       ////////// Physical parameters:
-
-    component_carriers = (
-      {
-        node_function                                         = "eNodeB_3GPP";
-        node_timing                                           = "synch_to_ext_device";
-        node_synch_ref                                        = 0;
-        frame_type					      = "TDD";
-        tdd_config 					      = 1;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 38;
-        downlink_frequency      			      = 2605000000L;
-        uplink_frequency_offset 			      = 0000000;
-        Nid_cell					      = 10;
-        N_RB_DL                 			      = 25;
-        Nid_cell_mbsfn          			      = 0;
-        nb_antenna_ports          			      = 1;
-        nb_antennas_tx          			      = 1;
-        nb_antennas_rx          			      = 1;
-        tx_gain                                            = 90;
-        rx_gain                                            = 125;
-        prach_root              			      = 0;
-        prach_config_index      			      = 0;
-        prach_high_speed        			      = "DISABLE";
-        prach_zero_correlation  			      = 1;
-        prach_freq_offset       			      = 2;
-        pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 1;
-        pucch_nCS_AN            			      = 0;
-        pucch_n1_AN             			      = 0;
-        pdsch_referenceSignalPower 			      =-27;
-        pdsch_p_b                  			      = 0;
-        pusch_n_SB                 			      = 1;
-        pusch_enable64QAM          			      = "DISABLE";
-        pusch_hoppingMode                                  = "interSubFrame";
-        pusch_hoppingOffset                                = 0;
-        pusch_groupHoppingEnabled  			      = "ENABLE";
-        pusch_groupAssignment      			      = 0;
-        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-        pusch_nDMRS1                                       = 1;
-        phich_duration                                     = "NORMAL";
-        phich_resource                                     = "ONESIXTH";
-        srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-        srs_SubframeConfig                                 =;
-        srs_ackNackST                                      =;
-        srs_MaxUpPts                                       =;*/
-
-        pusch_p0_Nominal                                   = -96;
-        pusch_alpha                                        = "AL1";
-        pucch_p0_Nominal                                   = -106;
-        msg3_delta_Preamble                                = 6;
-        pucch_deltaF_Format1                               = "deltaF2";
-        pucch_deltaF_Format1b                              = "deltaF3";
-        pucch_deltaF_Format2                               = "deltaF0";
-        pucch_deltaF_Format2a                              = "deltaF0";
-        pucch_deltaF_Format2b		    	      = "deltaF0";
-
-        rach_numberOfRA_Preambles                          = 64;
-        rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-        rach_sizeOfRA_PreamblesGroupA                      = ;
-        rach_messageSizeGroupA                             = ;
-        rach_messagePowerOffsetGroupB                      = ;
-      */
-        rach_powerRampingStep                              = 4;
-        rach_preambleInitialReceivedTargetPower            = -108;
-        rach_preambleTransMax                              = 10;
-        rach_raResponseWindowSize                          = 10;
-        rach_macContentionResolutionTimer                  = 48;
-        rach_maxHARQ_Msg3Tx                                = 4;
-
-        pcch_default_PagingCycle                           = 128;
-        pcch_nB                                            = "oneT";
-        bcch_modificationPeriodCoeff			      = 2;
-        ue_TimersAndConstants_t300			      = 1000;
-        ue_TimersAndConstants_t301			      = 1000;
-        ue_TimersAndConstants_t310			      = 1000;
-        ue_TimersAndConstants_t311			      = 10000;
-        ue_TimersAndConstants_n310			      = 20;
-        ue_TimersAndConstants_n311			      = 1;
-
-	ue_TransmissionMode				      = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.3"; port = 36412; });
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-
-    log_config :
-    {
-      global_log_level                      ="debug";
-      hw_log_level                          ="info";
-      phy_log_level                         ="info";
-      mac_log_level                         ="info";
-      rlc_log_level                         ="info";
-      pdcp_log_level                        ="info";
-      rrc_log_level                         ="info";
-   };
-
-  }
-);
-MACRLCs = (
-	{
-        num_cc = 1;
-        tr_s_preference = "local_L1";
-        tr_n_preference = "local_RRC";
-        scheduler_mode = "fairRR";
-        puSch10xSnr     =  150;
-        puCch10xSnr     =  150;
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 6
-         att_rx         = 6;
-         bands          = [38];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 125;
-         eNB_instances  = [0];
-
-    }
-);  
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
@@ -172,7 +172,12 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -185,7 +190,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
        bler_target_upper = 20.0;
        bler_target_lower = 10.0;
        max_ul_rb_index   = 27;
-        puSch10xSnr     =  250;
-        puCch10xSnr     =  230;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
        }  
 );

@@ -224,13 +231,13 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 2
         nb_rx          = 2
-         att_tx         = 12
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
@@ -172,7 +172,12 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -185,7 +190,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
        bler_target_upper = 20.0;
        bler_target_lower = 10.0;
        max_ul_rb_index   = 27;
-        puSch10xSnr     =  280;
-        puCch10xSnr     =  250;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
        }  
 );

@@ -224,13 +231,13 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 2
         nb_rx          = 2
-         att_tx         = 18
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
@@ -172,7 +172,12 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -185,7 +190,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -230,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,13 @@ eNBs =
    };

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412 ; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -147,7 +153,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,13 @@ eNBs =
    };

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -147,7 +153,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,13 @@ eNBs =
    };

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -147,7 +153,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,13 @@ eNBs =
    };

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///X2
    enable_x2 = "no";
@@ -145,7 +151,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
@@ -1,259 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 100;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.100prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 100;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.l2sim.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf
@@ -1,231 +0,0 @@
-Active_eNBs = ( "enb-l2sim-vnf");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "enb-l2sim-vnf";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 7;
-      downlink_frequency      			      = 2680000000L;
-      uplink_frequency_offset 			      = -120000000;
-      Nid_cell					      = 10;
-      N_RB_DL                 			      = 25;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal";
-      rxPool_sc_Period                                       = "sf40";
-      rxPool_data_CP_Len                                     = "normal";
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
-      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                               = 0;
-      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
-*/
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.3"; port = 36412; });
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.1";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.1";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.1";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-        
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	remote_s_address = "127.0.0.1";
-	local_s_address  = "127.0.0.1";
-	local_s_portc    = 50001;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-	scheduler_mode = "fairRR";
-        }  
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
@@ -1,259 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.rfsim.nos1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
@@ -1,259 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.30";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.30";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.30";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.usrpb200.tm1-norrc.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 30;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.25prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.50prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
@@ -1,259 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 50;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/enb.band7.50prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 50;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 6;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/untested/enb.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf
@@ -171,7 +171,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -184,7 +190,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf
@@ -180,7 +180,12 @@ eNBs =
    t_dc_overall      = 2000;      /* unit: millisecond */

 ////////// MCE parameters:
-    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
+    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///M2
    enable_enb_m2 = "yes";
@@ -203,7 +208,9 @@ eNBs =
    NETWORK_INTERFACES :
    {

+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -245,7 +252,12 @@ MCEs = (
            //M3
            enable_mce_m3 = "yes";

-            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
+            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );



@@ -362,10 +374,6 @@ RUs = (
    }
 );

-rfsimulator: {
-    serveraddr = "server";
-};
-
 THREAD_STRUCT = (
  {
    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf
@@ -174,7 +174,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -184,11 +190,18 @@ eNBs =
    tx2_reloc_overall = 2000;      /* unit: millisecond */
    t_dc_prep         = 1000;      /* unit: millisecond */
    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; });
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "CI_RCC_IP_ADDR";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf
@@ -177,7 +177,13 @@ eNBs =
    enable_measurement_reports = "no";

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///X2
    enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
@@ -179,7 +179,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -192,7 +198,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf
@@ -177,7 +177,13 @@ eNBs =
    enable_measurement_reports = "yes";

    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    ///X2
    enable_x2         = "yes";
@@ -188,7 +194,9 @@ eNBs =

    NETWORK_INTERFACES : 
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf
@@ -174,7 +174,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "no";

@@ -187,7 +193,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
--- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
@@ -1,255 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "yes";
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.16.137"; port = 36412; });
-
-    ///X2
-    enable_x2         = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.68.130";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.68.130";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.68.130";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-THREAD_STRUCT =
-(
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-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/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf
@@ -173,19 +173,31 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
-
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
    ///X2
    enable_x2 = "yes";
    t_reloc_prep      = 1000;      /* unit: millisecond */
    tx2_reloc_overall = 2000;      /* unit: millisecond */
    t_dc_prep         = 1000;      /* unit: millisecond */
    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; });
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "CI_RCC_IP_ADDR";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152

--- a/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
@@ -21,6 +21,7 @@ MACRLCs = (
        {
        num_cc = 1;
        tr_n_preference = "nfapi";
+        local_n_if_name  = "ens3";
        remote_n_address = "127.0.0.1"; //Proxy IP
        local_n_address  = "127.0.0.1";
        local_n_portc    = 50600;
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
@@ -172,7 +172,13 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );

    enable_measurement_reports = "yes";

@@ -185,7 +191,9 @@ eNBs =

    NETWORK_INTERFACES :
    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.1";
+        ENB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.1";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.1";
@@ -198,6 +206,7 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
+	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;
--- 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
@@ -116,7 +116,9 @@ gNBs =
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
      ssb_PositionsInBurst_Bitmap                                   = 1; #0x80;

 # ssb_periodicityServingCell
@@ -160,21 +162,32 @@ gNBs =


    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
-
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
    ///X2
    enable_x2 = "yes";
    t_reloc_prep      = 1000;      /* unit: millisecond */
    tx2_reloc_overall = 2000;      /* unit: millisecond */
    t_dc_prep         = 1000;      /* unit: millisecond */
    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "172.16.0.1"; });
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "172.16.0.1"; # rrc.band7.tm1.nfapi.conf:line 201
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );

    NETWORK_INTERFACES :
    {   # All of these have to be IP addr of gNB
                # if in CORE container, make it 172.16.0.X
                # if not launched in CORE, can set to lo (127.0.0.2)
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
        GNB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.2";
+        GNB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
        GNB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.2";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
        GNB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.2";
@@ -187,6 +200,7 @@ gNBs =
 MACRLCs = (
        {
        num_cc = 1;
+        local_s_if_name  = "lo:";
        remote_s_address = "127.0.0.1"; // pnf addr [!]
        local_s_address  = "127.0.0.2"; // vnf addr
        local_s_portc    = 50601; // vnf p5 port
--- a/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
@@ -13,6 +13,7 @@ L1s = (
        {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
+	local_n_if_name  = "ens3";
 	remote_n_address = "127.0.0.1"; //Proxy IP
 	local_n_address  = "127.0.0.1";
 	local_n_portc    = 50000;
--- a/ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf
--- a/Show More
+++ b/Show More