Added citation part.

Signed-off-by: Tetsuya Iye <tetsuya-iye@kke.co.jp>

.clang-format

@@ -62,7 +62,6 @@ ForEachMacros:
   - BOOST_FOREACH
   - RB_FOREACH
   - UE_iterator
-  - FOR_EACH_SEQ_ARR
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'

.gitignore

@@ -5,6 +5,7 @@
 cmake_targets/log/
 cmake_targets/*/build/
 cmake_targets/ran_build/
+cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 
@@ -20,14 +21,6 @@ GRTAGS
 GTAGS
 tags
 
-# Package conffiles
-
-tools/packages/oai-lte/conffiles
-tools/packages/oai-nr/conffiles
-tools/packages/liboai-common/conffiles
-tools/packages/liboai-usrp/conffiles
-
-
 # others
 nfapi_nr_interface_scf
 *.log

CHANGELOG.md

@@ -1,119 +1,5 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
 # RELEASE NOTES: #
 
-## [v2.4.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.4.0) -> December 2025. ##
-
-General new features and improvements (both RAN and UE):
-- Rework LDPC BBdev/AAL interface and support both AMD T2/Intel vRAN Boost
-  (VRB) 1 accelerators
-- Add a taps client for vrtsim real-time simulator (check: vrtsim release?)
-- Add new RFemulator virtual radio driver to emulate radio (including noise
-  generation) for gNB/UE standalone operation
-- RLC AM reception improvements for high-throughput scenarios (!3512)
-- Small NTN fixes (!3659, !3666, !3581, !3652)
-- Improvements to imScope
-
-Stability and bug fixes:
-- RFsimulator: fix concurrency problems during multi-client connection
-- USRP driver: support synchronization of USRP B200
-- MAC scheduler improvements
-- General L1 improvements for efficiency and stability
-- Correct PRS bug and test in CI
-- Upgrade Ubuntu container images to Ubuntu 24.04
-- All build system targets compile (`make/ninja all`)
-- Minor cleanup, harmonization, and performance improvements all over the stack
-- Simplify CI code
-
-RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
-- Support of N2 handover
-- Support of "UL-heavy" TDD patterns, e.g., DSUUU
-- Open Fronthaul M-plane: CM improvements, PM implementation, and additional
-  v16.01 support
-- Improve interoperability with Nvidia Aerial L1 to support 2 layer UL
-- Add O-RAN OSC WLS library as FAPI transport and enable L1/L2 shared memory
-  split
-- Implement FAPI Stop exchange
-- Improve interoperability with srsRAN_Project DU
-- Add new synchronized real-time data recording application (!3462)
-- Support for measurement gaps and general handover fixes
-- Support of RRC PDU session release procedure
-- Add CU-UP load tester
-- Correct BWP scheduling and support multiple BWPs per UE
-
-nrUE changes:
-- Support one additional PDU session (see !3486)
-- L3 measurements for A2 measurement reports
-- Support for type0 PDSCH frequency allocation
-- UE symbol based PDCCH receiver
-
-Regression or removals:
-- No known regressions
-- Unused L2 simulator code has been removed
-- Unused Benetel radio driver code (not FHI 7.2!) has been removed
-
-Configuration file changes:
-- `gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow` is automatically
-  computed and can be removed
-- `gNBs.[0].bwp_list` has been added (moved from entries in
-  `gNBs.[0].servingCellConfigDedicated`)
-- `gNBs.[0].phaseTrackingRS` has been added (moved from entries in
-  `gNBs.[0].servingCellConfigDedicated`)
-- `gNBs.[0].local_s_portc` and `gNBs.[0].remote_s_portc` have no effect and
-  should be removed
-- `gNBs.[0].CSI_report_type` has been added
-- `MACRLCs.[0].ulsch_max_frame_inactivity` is automatically computed and can be
-  removed
-- `MACRLCs.[0].local_n_portc` and `MACRLCs.[0].remote_n_portc` have no effect and
-  should be removed
-- `MACRLCs.[0].stats_max_ue` has been added
-
-## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
-
-General new features and improvements (both RAN and UE):
-- Preliminary support for RedCap UEs
-- Support for NTN LEO scenarios including SIB19 and channel emulation (see
-  doc/RUNMODEM.md)
-- VRTSIM: new shared memory realtime radio (see develop/radio/vrtsim/README.md)
-- Support for TDD pattern 2
-- Support for long PRACH
-- Support for SIB2
-- Add unit tests using ctest (see doc/UnitTests.md)
-
-Stability and bug fixes:
-- Improve various procedures (e.g., RRC reestablishment, RRC Reject, ...)
-- Add improvements for ImScope
-- Bugfixes in the entire stack (e.g., #803, #805, #810, #812, #818, #852, #878,
-  #884, #890, #895, #901, #907, #932, #939 ...)
-- Documentation updates
-- And many other small fixes, like memory leaks, crashes, ...
-
-RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
-- Stability and performance improvements when running with 4-layer DL MIMO
-- Stability and performance improvements when running with 2-layer UL MIMO
-- Interoperability testing with Metanoia Jura and Foxconn RUs
-- Support of O-RAN 7.2 M-plane (Start-up procedure including configuration
-  management, see also doc/ORAN_FHI7.2_Tutorial.md)
-- Upgrade OSC FHI (xran) from E to F release
-- Refactoring of LDPC interface and performance improvements
-- Support for nFAPI in all scenarios for FR1 (see doc/nfapi.md)
-- Support at least 32 UEs concurrently
-- Improve robustness when running in split modes (F1, E1)
-- Add basic support for beam management in FR2
-- Add support for O1 on DU (see also https://gitlab.eurecom.fr/oai/o1-adapter)
-- E2 agent: Support for multiple E2SM-RC report service styles
-
-nrUE changes:
-- Refactoring of threading towards better code and performance
-- Add or rework various procedures (e.g., RA with C-RNTI, Going to Idle, RA, ...)
-- Refactor and extend NAS implementation (e.g., Service Request, Registration
-  Request, Service Acept, Service Reject, ...)
-- Support for continuous frequency offset compensation
-- Reduce minimum RX-to-TX time to 3
-
-Regression:
-- Multiple BWPs do not work reliably on gNB; use tag 2025.w17
-
 ## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
 
 General 5G improvements (both gNB and UE):

CHANNELEMULATOR.md

@@ -0,0 +1,156 @@
+<script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.min.js">
+</script>
+<script type="text/x-mathjax-config">
+ MathJax.Hub.Config({
+ tex2jax: {
+ inlineMath: [['$', '$'] ],
+ displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
+ }
+ });
+</script>
+
+# Overview
+This document serves as a guide to loading a pre-generated dataset of Channel Impulse Responses (CIRs)—for example, computed using Sionna RT—and performing real-time 5G emulation using OpenAirInterface (OAI).
+
+For full system architecture details, please refer to: [https://arxiv.org/abs/2503.12177v2](https://arxiv.org/abs/2503.12177v2)
+
+As a sample scenario, this repository includes the Shibuya Scramble Crossing CIR dataset used in the paper, placed under `oai_cir/cir/output/binary/`.
+
+# Supported Environment
+
+|||
+|-|-|
+|CPU                    | AMD Ryzen 9 7900X 12-core processor (x24) |
+|RAM                    | 32 GB                                     |
+|Operating System       | Ubuntu 22.04.4 LTS                        |
+|Linux kernel version   | 6.8.1-060801-generic                      |
+|SDR                    | USRP B200                                 |
+|COTS UE                | Quectel RM500Q-GL                         |
+|||
+
+# Prerequisites (after setting up base OAI environment)
+
+## 1. Install AOCL-BLAS
+
+```bash
+# Install dependencies
+sudo apt install build-essential make g++ gfortran cmake
+
+# Build and install BLIS
+git clone https://github.com/amd/blis.git
+cd blis
+./configure --enable-cblas -t openmp auto
+make
+make check
+sudo make install
+sudo ldconfig
+```
+
+## 2. Configure pkg-config
+
+```bash
+# Copy the pkg-config file
+sudo cp /usr/local/share/pkgconfig/blis-mt.pc /usr/local/share/pkgconfig/cblis.pc
+```
+
+## 3. Configure AOCL-BLAS multithreading
+
+```bash
+echo "export BLIS_NUM_THREADS=6" >> ~/.bashrc
+source ~/.bashrc
+```
+
+For more details, see:
+[https://github.com/amd/blis/blob/master/docs/Multithreading.md](https://github.com/amd/blis/blob/master/docs/Multithreading.md)
+
+---
+
+## Configuration: `oai_cir/cir_conf.txt`
+
+The 2nd through 5th rows of the parameters in the `oai_cir/cir_conf.txt` as shown in below can be set freely (the 1st row is read-only).
+
+1. **Max path gain \[dB]** in the CIR dataset (read-only).
+2. **Offset \[dB]** added to compensate signal attenuation (typically around (–2)× the first-line value + 5), to fit within the gNB/UE receiver's dynamic range.
+3. **Noise level \[dB]**.
+4. **Number of delay taps** $N$ to apply in the convolution.
+5. **Number of CIR data files** to vary over time based on the mobility scenario.
+
+Notes:
+
+* Line 2: To maintain a continuous connection between the gNB and UE throughout the sample scenario, this **Offset** parameter must be finely tuned. If the Offset is set too low, the UE either fails to attach to the gNB or detaches almost immediately. If it is set too high, a COTS UE’s automatic-gain control will engage, complicating the link-budget calculation; with an OAI UE or RF-simulation-based nrUE, the signal will exceed the dynamic range and the UE will likewise fail to attach. In the test environment, a value of roughly **(Max path gain × –2) + 5 dB** seemed to be appropriate.
+
+* Line 4: After bandwidth filtering, delay taps are sorted by descending amplitude, and only the top $N$ taps are used.
+  With the sample CIR dataset, you can specify any value from 1 to 146.
+  In the test environment, real-time communication between gNB (USRP B200) and COTS UE (Quectel RM500Q-GL) was possible up to $N = 29$; for larger values the real-time processing could not keep up.
+
+* Line 5: Specifies how many files (maximum = number of files in `oai_cir/cir/output/binary/`, default 230; minimum = 1) to load in sequence.
+  Each file's CIR data is convolved with the baseband signal for 100 ms, then the emulator switches to the next file. 
+  Once the last file finishes, the cycle restarts at `delay{amp/index}list0000.b`.
+
+### Binary file formats
+
+#### `delayamplist****.b`
+$h^{\rm re}_{\rm sort,1}, h^{\rm im}_{\rm sort,1}, h^{\rm re}_{\rm sort,2}, h^{\rm im}_{\rm sort,2}, \cdots$
+
+Each $h^{\rm re/im}_{{\rm sort},n}$ is the real/imaginary part (float32) of the $n$-th highest-amplitude complex tap from the sorted CIR.
+
+#### `delayindexlist****.b`
+$i_{\rm sort,1}, i_{\rm sort,2}, i_{\rm sort,3}, \cdots$
+
+Each $i_{{\rm sort},n}$ is the original delay index (int32) before sorting.
+
+---
+
+# Build and Run Emulator
+
+## Option 1: gNB with USRP
+Build gNB with USRP mode.
+```bash
+cd ~/oai_cir/cmake_targets/
+sudo ./build_oai -w USRP --gNB
+```
+
+Run gNB with USRP mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+./nr-softmodem \
+  -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.106PRB.usrpb210.chemu.yaml \
+  --sa --non-stop -E
+```
+
+## Option 2: RF Simulator with gNB and nrUE
+Build gNB and nrUE with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/
+sudo ./build_oai -w SIMU --gNB --nrUE
+```
+
+Run gNB with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+sudo ./nr-softmodem \
+  -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.106PRB.usrpb210.chemu.yaml \
+  --sa --non-stop --rfsim --rfsimulator.serveraddr server
+```
+
+Run nrUE with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+sudo ./nr-uesoftmodem \
+  -C 4019160000 -r 106 --numerology 1 --ssb 144 \
+  --rfsim --non-stop --band 77 --rfsimulator.serveraddr 127.0.0.1
+```
+
+# Citation
+If you use this implementation, please cite it as:
+```bibtex
+@misc{OWDT,
+    title = {Open Wireless Digital Twin: End-to-End 5G Mobility Emulation in O-RAN Framework},
+    author = {Tetsuya Iye and Masaya Sakamoto and Shohei Takaya and Eisaku Sato and Yuki Susukida and Yu Nagaoka and Kazuki Maruta and Jin Nakazato},
+    year = {2025},
+    eprint={2503.12177},
+    archivePrefix={arXiv},
+    primaryClass={cs.NI},
+    url={https://arxiv.org/abs/2503.12177v2}, 
+}
+```

CONTRIBUTING.md

@@ -1,5 +1,3 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
 # Contributing to OpenAirInterface #
 
 We want to make contributing to this project as easy and transparent as possible.
@@ -28,13 +26,5 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
 # License #
 
 By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under
-
-1. [CSSL v1.0 license](LICENSES/preferred/CSSL-v1.0.txt): for RAN and UE
-   related source code and test scripts
-2. [CC-BY-4.0](LICENSES/preferred/CC-BY-4.0.txt): All the documentation
-3. [MIT](LICENSES/preferred/MIT.txt): Orchestration (helm-charts, docker
-   compose)
-
-Certain files are using different licenses; you can read about them in
-[NOTICE](NOTICE).
+licensed under the license described in the file [`LICENSE`](./LICENSE) in the
+root directory of this source tree.

LICENSE

@@ -1,223 +1,200 @@
-          Collaborative Standards Software License v1.0 (CSSL)
+				The OpenAirInterface Software Alliance (OSA)
+					OAI Public License (Version 1.1)
 
-LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF
-OPENAIRINTERFACE. The pdf version of this document can be downloaded from
-https://openairinterface.org/oai-cssl/.
+LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF OPENAIR 5G SOFTWARE.
 
-1. Definitions.
+1.	Definitions.
 
-“License” shall mean the terms and conditions for use, reproduction, and
-distribution set forth in this document.
+“License” shall mean the terms and conditions for use, reproduction, and distribution set forth 
+in this document.
 
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
+“Licensor” shall mean the OpenAirInterface Software Alliance.
 
-“Legal Entity” shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
+“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the 
+acting entity and all other entities that control, are controlled by, or are under common control 
+with that entity. For the purposes of this definition, “control” means (i) the power, direct or 
+indirect, to cause the direction or management of such entity, whether by contract or 
+otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) 
+beneficial ownership of such entity.
 
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
-permissions granted by this License.
+“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by 
+this License.
 
-“Source” form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
+“Source” form shall mean the preferred form for making modifications, including but not 
+limited to software source code, documentation source, and configuration files.
 
-“Object” form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
+“Object” form shall mean any form resulting from mechanical transformation or translation of 
+a Source form, including but not limited to compiled object code, generated documentation, 
+and conversions to other media types.
 
-“Work” shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
+“OpenAirInterface Software Alliance” shall mean the endowment fund established at the 
+initiative of Eurecom, an educational and research establishment located at Campus Sophia 
+Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 
+November 2014.
 
-“Derivative Works” shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
+“Work” shall mean the work of authorship, whether in Source or Object form, made available 
+under the License, as indicated by a copyright notice that is included in or attached to the 
+work (an example is provided in the Appendix below).
 
-“Contribution” shall mean any work of authorship that is intentionally submitted
-to Licensor for inclusion in the Work by the copyright owner or by an individual
-or Legal Entity authorized to submit on behalf of the copyright owner. For the
-purposes of this definition, “submitted” means any form of electronic, or
-written communication sent to the Licensor or its representatives, including but
-not limited to communication on electronic mailing lists, source code control
-systems, and issue tracking systems that are managed by, or on behalf of, the
-Licensor for the purpose of discussing and improving the Work but excluding
-communication that is conspicuously marked or otherwise designated in writing by
-the copyright owner or entity authorized by the copyright owner as "Not a
-Contribution."
+“Derivative Works” shall mean any work, whether in Source or Object form, that is based on 
+(or derived from) the Work and for which the editorial revisions, annotations, elaborations, or 
+other modifications represent, as a whole, an original work of authorship. For the purposes of 
+this License, Derivative Works shall not include works that remain separable from, or merely 
+link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-“Contributor License Agreement” shall mean the agreement signed by any
-Contributor setting forth the terms and conditions applicable to its
-Contribution.
+“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor 
+for inclusion in the Work by the copyright owner or by an individual or Legal Entity 
+authorized to submit on behalf of the copyright owner. For the purposes of this definition, 
+“submitted” means any form of electronic, , or written communication sent to the Licensor or 
+its representatives, including but not limited to communication on electronic mailing lists, 
+source code control systems, and issue tracking systems that are managed by, or on behalf of, 
+the Licensor for the purpose of discussing and improving the Work
 
-“Contributor” shall mean any individual or Legal Entity on behalf of whom a
-Contribution has been received by Licensor and subsequently incorporated within
-the Work.
+“Contributor License Agreement” shall mean the agreement signed by any Contributor setting 
+forth the terms and conditions applicable to its Contribution. 
 
-2. Grant of Copyright License.
+“Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution 
+has been received by Licensor and subsequently incorporated within the Work.
 
-Subject to the terms and conditions of this License, Licensor and each
-Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, and distribute the Work
-and such Derivative Works in Source or Object form.
+2.	Grant of Copyright License.
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
+copyright license to reproduce, prepare Derivative Works of, publicly display, publicly 
+perform, and distribute the Work and such Derivative Works in Source or Object form
 
-3. Grant of Patent License.
+3. 	Grant of Patent License.
 
 3.1 Grant of Patent License for study, testing and research purposes:
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
+(except as stated in this section) patent license to make, have made, use, and otherwise 
+transfer (excluding selling) the Work, solely for study, testing and research purposes, where 
+such license applies only to those patent claims licensable by Licensor or such Contributor 
+that are necessarily infringed respectively by the Work and/or the said Contributor 
+Contribution(s) alone or by combination of their Contribution(s) with the Work  to which 
+such Contribution(s) was submitted (“Essential Patents”).
 
-Subject to the terms and conditions of this License, Licensor and each
-Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section) patent
-license to make, have made, use, and otherwise transfer (excluding selling) the
-Work, solely for study, testing and research purposes, where such license
-applies only to those patent claims licensable by Licensor or such Contributor
-that are necessarily infringed respectively by the Work and/or the said
-Contributor Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted (“Essential Patents”).
-
-3.2 Grant of Patent License for purposes other than study, testing and research:
-
-For purposes other than study, testing and research, and subject to the terms
-and conditions of this License, You commit to be prepared to negotiate, in good
-faith, a non-exclusive, nontransferable, non-assignable license of Essential
-Patents with each Contributor and/or the Licensor on Fair, Reasonable and
-Non-Discriminatory (“FRAND”) terms and conditions for the use of the Work or
-Contribution(s) incorporated within the Work.
+3.2 Grant of Patent License for purposes other than study and research:
+For purposes other than study, testing and research, and subject to the terms and conditions of 
+this License, You commit to be prepared to negotiate a non-exclusive, non-transferable, non-
+assignable license of Essential Patents with each Contributor and/or the Licensor on Fair, 
+Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the use of the 
+Work or Contribution(s) incorporated within the Work.
+Licensor and/or each Contributor, by submitting a Contribution, will identify any of its known 
+Essential Patent it owns related to the Work and/or its Contribution.
 
 3.3 Patent Litigation
-
-If You institute patent litigation against any entity making use of the Work
-solely for study, testing and research purposes (including a cross-claim or
-counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated
-within the Work constitutes direct or contributory patent infringement, then the
-patent licenses granted to You under section 3.1 of this License for that Work
-shall terminate as of the date such litigation is filed.
+If You institute patent litigation against any entity making use of the Work solely for study, 
+testing and research purposes (including a cross-claim or counterclaim in a lawsuit) alleging 
+that the Work or a Contribution incorporated within the Work constitutes direct or 
+contributory patent infringement, then the patent licenses granted to You under section 3.1 of 
+this License for that Work shall terminate as of the date such litigation is filed.
 
 4. Sublicensing
-
-You may grant sublicenses under the licenses granted under sections 2 and 3.1
-provided that the sublicense is subject to and inclusive of all the terms of and
-rights under this License to which the Work is or was distributed.
+You may grant sublicenses under the licenses granted under sections 2 and 3.1 provided that 
+the sublicense is subject to and inclusive of all the terms of and rights under this License to 
+which the Work is or was distributed by the OpenAirInterface Software Alliance.
 
 5. Redistribution
+Subject to terms and conditions set forth in sections 2 and 3, You may reproduce and 
+distribute copies of the Work or Derivative Works thereof in any medium, with or without 
+modifications, and in Source or Object form, provided that You meet the following 
+conditions:  
 
-Subject to terms and conditions set forth in sections 2 and 3, You may reproduce
-and distribute copies of the Work or Derivative Works thereof in any medium,
-with or without modifications, and in Source or Object form, provided that You
-meet the following conditions:
+1. You must give any other recipients of the Work or Derivative Works a copy of this 
+License; and
 
-1. You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
+2. You must cause any modified files by You to carry prominent notices stating that You 
+changed the files; and
 
-2. You must cause any modified files by You to carry prominent notices stating
-that You changed the files; and
+3. You must retain, in the Source form of any Derivative Works that You distribute, all 
+copyright, patent, trademark, and attribution notices from the Source form of the Work, 
+excluding those notices that do not pertain to any part of the Derivative Works; and
 
-3. You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
+4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative 
+Works that You distribute must include a readable copy of the attribution notices contained 
+within such NOTICE file, excluding those notices that do not pertain to any part of the 
+Derivative Works, in at least one of the following places: within a NOTICE text file 
+distributed as part of the Derivative Works; within the Source form or documentation, if 
+provided along with the Derivative Works; or, within a display generated by the Derivative 
+Works, if and wherever such third-party notices normally appear. The contents of the 
+NOTICE file are for informational purposes only and do not modify the License. You may 
+add Your own attribution notices within Derivative Works that You distribute, alongside or as 
+an addendum to the NOTICE text from the Work, provided that such additional attribution 
+notices cannot be construed as modifying the License. 
+You may add Your own copyright statement to Your modifications and may provide 
+additional or different license terms and conditions for use, reproduction, or distribution of 
+Your modifications, or for any such Derivative Works as a whole, provided Your use, 
+reproduction, and distribution of the Work otherwise complies with the conditions stated in 
+this License.
 
-4. If the Work includes a “NOTICE” text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
+6. Submission of Contributions. 
+Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be 
+under the terms and conditions of this License, without any additional terms or conditions. 
+Notwithstanding the above, nothing herein shall supersede or modify the terms of any 
+separate license agreement such as the Contributor License Agreement You may have 
+executed with Licensor regarding such Contributions.
 
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
+7. Trademarks. 
+This License does not grant permission to use the trade names, trademarks, service marks, or 
+product names of the Licensor, except as required for reasonable and customary use in 
+describing the origin of the Work and reproducing the content of the NOTICE file.
 
-6. Submission of Contributions.
+8. Disclaimer of Warranty. 
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and 
+each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT 
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, 
+without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, 
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely 
+responsible for determining the appropriateness of using or redistributing the Work and 
+assume any risks associated with your exercise of permissions under this License.
 
-Any contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions.  Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement such as the
-Contributor License Agreement You may have executed with Licensor regarding such
-Contributions.
+9. Limitation of Liability. 
+In no event and under no legal theory, whether in tort (including negligence), contract, or 
+otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or 
+agreed to in writing, shall Licensor and any Contributor, as such, be liable to You for 
+damages, including any direct, indirect, special, incidental, or consequential damages of any 
+character arising as a result of this License or out of Your use or inability to use the Work 
+(including but not limited to damages for loss of goodwill, work stoppage, computer failure or 
+malfunction, or any and all other commercial damages or losses), even if such Contributor has 
+been advised of the possibility of such damages.
 
-7. Trademarks.
+10. Accepting Warranty or Additional Liability. 
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and 
+charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations 
+and/or rights consistent with this License. However, in accepting such obligations, You may 
+act only on Your own behalf and on Your sole responsibility, not on behalf of any other 
+Contributor and/or the Licensor, and only if You agree to indemnify, defend, and hold each 
+Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted 
+against, such Contributor and/or Licensor by reason of Your accepting any such warranty or 
+additional liability.
 
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-8. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with your exercise of
-permissions under this License.
-
-9. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall Licensor and any
-Contributor, as such, be liable to You for damages, including any direct,
-indirect, special, incidental, or consequential damages of any character arising
-as a result of this License or out of Your use or inability to use the Work
-(including but not limited to damages for loss of goodwill, work stoppage,
-computer failure or malfunction, or any and all other commercial damages or
-losses), even if such Contributor has been advised of the possibility of such
-damages.
-
-10. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor and/or the Licensor,
-and only if You agree to indemnify, defend, and hold each Contributor and/or the
-Licensor harmless for any liability incurred by, or claims asserted against,
-such Contributor and/or Licensor by reason of Your accepting any such warranty
-or additional liability obligations.
+11. Applicable law. 
+The present license shall be governed by the laws of France.
 
 END OF TERMS AND CONDITIONS
 
-1. APPENDIX: How to apply the PRESENT License to your work
-
-To apply the present License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets “[]” replaced with your own
-identifying information. (Don’t include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
+1.	APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
+To apply the present License to your work, attach the following boilerplate notice, with the 
+fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t 
+include the brackets!) The text should be enclosed in the appropriate comment syntax for the 
+file format. We also recommend that a file or class name and description of purpose be 
+included on the same “printed page” as the copyright notice for easier identification within 
 third-party archives.
 
 Copyright [yyyy] [name of copyright owner]
 
-Licensed under the Standards Software License, version 1.0, terms and conditions
-(the “License”); you may not use this file except in compliance with the
-License. You may obtain a copy of the License at [URL link]
+Licensed under the License terms and conditions for use, reproduction, and distribution of 
+OPENAIR 5G software (the “License”);
 
-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.
+you may not use this file except in compliance with the License. You may obtain a copy of 
+the License at
+
+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.
 
-See the License for the specific language governing permissions and limitations
-under the License.

LICENSES/deprecated/OAI-PL-v1.1.txt

@@ -1,201 +0,0 @@
-Valid-License-Identifier: OAI-PL-v1.1
-URL: https://openairinterface.org/oai-public-license-v1-1/
-Usage-Guide:
-  To use the OAI-PL-v1.1 License put the following text in the header 
-
-  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
-   
-
-License-Text:
-
-OAI Public License (Version 1.1)
-
-LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF OPENAIR 5G SOFTWARE.
-
-1.  Definitions.
-
-“License” shall mean the terms and conditions for use, reproduction, and distribution set forth
-in this document.
-
-“Licensor” shall mean the OpenAirInterface Software Alliance.
-
-“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the
-acting entity and all other entities that control, are controlled by, or are under common control
-with that entity. For the purposes of this definition, “control” means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
-beneficial ownership of such entity.
-
-“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by
-this License.
-
-“Source” form shall mean the preferred form for making modifications, including but not
-limited to software source code, documentation source, and configuration files.
-
-“Object” form shall mean any form resulting from mechanical transformation or translation of
-a Source form, including but not limited to compiled object code, generated documentation,
-and conversions to other media types.
-
-“OpenAirInterface Software Alliance” shall mean the endowment fund established at the
-initiative of Eurecom, an educational and research establishment located at Campus Sophia
-Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18
-November 2014.
-
-“Work” shall mean the work of authorship, whether in Source or Object form, made available
-under the License, as indicated by a copyright notice that is included in or attached to the
-work (an example is provided in the Appendix below).
-
-“Derivative Works” shall mean any work, whether in Source or Object form, that is based on
-(or derived from) the Work and for which the editorial revisions, annotations, elaborations, or
-other modifications represent, as a whole, an original work of authorship. For the purposes of
-this License, Derivative Works shall not include works that remain separable from, or merely
-link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor
-for inclusion in the Work by the copyright owner or by an individual or Legal Entity
-authorized to submit on behalf of the copyright owner. For the purposes of this definition,
-“submitted” means any form of electronic, , or written communication sent to the Licensor or
-its representatives, including but not limited to communication on electronic mailing lists,
-source code control systems, and issue tracking systems that are managed by, or on behalf of,
-the Licensor for the purpose of discussing and improving the Work
-
-“Contributor License Agreement” shall mean the agreement signed by any Contributor setting
-forth the terms and conditions applicable to its Contribution.
-
-“Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution
-has been received by Licensor and subsequently incorporated within the Work.
-
-2.  Grant of Copyright License.
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of, publicly display, publicly
-perform, and distribute the Work and such Derivative Works in Source or Object form
-
-3.  Grant of Patent License.
-
-3.1 Grant of Patent License for study, testing and research purposes:
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made, use, and otherwise
-transfer (excluding selling) the Work, solely for study, testing and research purposes, where
-such license applies only to those patent claims licensable by Licensor or such Contributor
-that are necessarily infringed respectively by the Work and/or the said Contributor
-Contribution(s) alone or by combination of their Contribution(s) with the Work  to which
-such Contribution(s) was submitted (“Essential Patents”).
-
-3.2 Grant of Patent License for purposes other than study and research:
-For purposes other than study, testing and research, and subject to the terms and conditions of
-this License, You commit to be prepared to negotiate a non-exclusive, non-transferable, non-
-assignable license of Essential Patents with each Contributor and/or the Licensor on Fair,
-Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the use of the
-Work or Contribution(s) incorporated within the Work.
-Licensor and/or each Contributor, by submitting a Contribution, will identify any of its known
-Essential Patent it owns related to the Work and/or its Contribution.
-
-3.3 Patent Litigation
-If You institute patent litigation against any entity making use of the Work solely for study,
-testing and research purposes (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes direct or
-contributory patent infringement, then the patent licenses granted to You under section 3.1 of
-this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Sublicensing
-You may grant sublicenses under the licenses granted under sections 2 and 3.1 provided that
-the sublicense is subject to and inclusive of all the terms of and rights under this License to
-which the Work is or was distributed by the OpenAirInterface Software Alliance.
-
-5. Redistribution
-Subject to terms and conditions set forth in sections 2 and 3, You may reproduce and
-distribute copies of the Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You meet the following
-conditions:
-
-1. You must give any other recipients of the Work or Derivative Works a copy of this
-License; and
-
-2. You must cause any modified files by You to carry prominent notices stating that You
-changed the files; and
-
-3. You must retain, in the Source form of any Derivative Works that You distribute, all
-copyright, patent, trademark, and attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of the Derivative Works; and
-
-4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative
-Works that You distribute must include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not pertain to any part of the
-Derivative Works, in at least one of the following places: within a NOTICE text file
-distributed as part of the Derivative Works; within the Source form or documentation, if
-provided along with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of the
-NOTICE file are for informational purposes only and do not modify the License. You may
-add Your own attribution notices within Derivative Works that You distribute, alongside or as
-an addendum to the NOTICE text from the Work, provided that such additional attribution
-notices cannot be construed as modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or distribution of
-Your modifications, or for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies with the conditions stated in
-this License.
-
-6. Submission of Contributions.
-Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be
-under the terms and conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of any
-separate license agreement such as the Contributor License Agreement You may have
-executed with Licensor regarding such Contributions.
-
-7. Trademarks.
-This License does not grant permission to use the trade names, trademarks, service marks, or
-product names of the Licensor, except as required for reasonable and customary use in
-describing the origin of the Work and reproducing the content of the NOTICE file.
-
-8. Disclaimer of Warranty.
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and
-each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
-responsible for determining the appropriateness of using or redistributing the Work and
-assume any risks associated with your exercise of permissions under this License.
-
-9. Limitation of Liability.
-In no event and under no legal theory, whether in tort (including negligence), contract, or
-otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or
-agreed to in writing, shall Licensor and any Contributor, as such, be liable to You for
-damages, including any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of Your use or inability to use the Work
-(including but not limited to damages for loss of goodwill, work stoppage, computer failure or
-malfunction, or any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-10. Accepting Warranty or Additional Liability.
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and
-charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such obligations, You may
-act only on Your own behalf and on Your sole responsibility, not on behalf of any other
-Contributor and/or the Licensor, and only if You agree to indemnify, defend, and hold each
-Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted
-against, such Contributor and/or Licensor by reason of Your accepting any such warranty or
-additional liability.
-
-11. Applicable law.
-The present license shall be governed by the laws of France.
-
-END OF TERMS AND CONDITIONS

LICENSES/exception/Apache-2.0.txt

@@ -1,183 +0,0 @@
-Valid-License-Identifier: Apache-2.0
-SPDX-URL: https://spdx.org/licenses/Apache-2.0.html
-Usage-Guide:
-  To use the Apache License version 2.0 put the following SPDX tag/value
-  pair into a comment according to the placement guidelines in the
-  licensing rules documentation:
-    SPDX-License-Identifier: Apache-2.0
-License-Text:
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source,
-and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the
-Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial
-revisions, annotations, elaborations, or other modifications represent, as
-a whole, an original work of authorship. For the purposes of this License,
-Derivative Works shall not include works that remain separable from, or
-merely link (or bind by name) to the interfaces of, the Work and Derivative
-Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor for
-inclusion in the Work by the copyright owner or by an individual or Legal
-Entity authorized to submit on behalf of the copyright owner. For the
-purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems that
-are managed by, or on behalf of, the Licensor for the purpose of discussing
-and improving the Work, but excluding communication that is conspicuously
-marked or otherwise designated in writing by the copyright owner as "Not a
-Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on
-behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-   reproduce, prepare Derivative Works of, publicly display, publicly
-   perform, sublicense, and distribute the Work and such Derivative Works
-   in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-   this section) patent license to make, have made, use, offer to sell,
-   sell, import, and otherwise transfer the Work, where such license
-   applies only to those patent claims licensable by such Contributor that
-   are necessarily infringed by their Contribution(s) alone or by
-   combination of their Contribution(s) with the Work to which such
-   Contribution(s) was submitted. If You institute patent litigation
-   against any entity (including a cross-claim or counterclaim in a
-   lawsuit) alleging that the Work or a Contribution incorporated within
-   the Work constitutes direct or contributory patent infringement, then
-   any patent licenses granted to You under this License for that Work
-   shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-   Derivative Works thereof in any medium, with or without modifications,
-   and in Source or Object form, provided that You meet the following
-   conditions:
-
-   a. You must give any other recipients of the Work or Derivative Works a
-      copy of this License; and
-
-   b. You must cause any modified files to carry prominent notices stating
-      that You changed the files; and
-
-   c. You must retain, in the Source form of any Derivative Works that You
-      distribute, all copyright, patent, trademark, and attribution notices
-      from the Source form of the Work, excluding those notices that do not
-      pertain to any part of the Derivative Works; and
-
-   d. If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained within
-      such NOTICE file, excluding those notices that do not pertain to any
-      part of the Derivative Works, in at least one of the following
-      places: within a NOTICE text file distributed as part of the
-      Derivative Works; within the Source form or documentation, if
-      provided along with the Derivative Works; or, within a display
-      generated by the Derivative Works, if and wherever such third-party
-      notices normally appear. The contents of the NOTICE file are for
-      informational purposes only and do not modify the License. You may
-      add Your own attribution notices within Derivative Works that You
-      distribute, alongside or as an addendum to the NOTICE text from the
-      Work, provided that such additional attribution notices cannot be
-      construed as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and may
-    provide additional or different license terms and conditions for use,
-    reproduction, or distribution of Your modifications, or for any such
-    Derivative Works as a whole, provided Your use, reproduction, and
-    distribution of the Work otherwise complies with the conditions stated
-    in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-   Contribution intentionally submitted for inclusion in the Work by You to
-   the Licensor shall be under the terms and conditions of this License,
-   without any additional terms or conditions. Notwithstanding the above,
-   nothing herein shall supersede or modify the terms of any separate
-   license agreement you may have executed with Licensor regarding such
-   Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-   in writing, Licensor provides the Work (and each Contributor provides
-   its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-   OF ANY KIND, either express or implied, including, without limitation,
-   any warranties or conditions of TITLE, NON-INFRINGEMENT,
-   MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
-   responsible for determining the appropriateness of using or
-   redistributing the Work and assume any risks associated with Your
-   exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether
-   in tort (including negligence), contract, or otherwise, unless required
-   by applicable law (such as deliberate and grossly negligent acts) or
-   agreed to in writing, shall any Contributor be liable to You for
-   damages, including any direct, indirect, special, incidental, or
-   consequential damages of any character arising as a result of this
-   License or out of the use or inability to use the Work (including but
-   not limited to damages for loss of goodwill, work stoppage, computer
-   failure or malfunction, or any and all other commercial damages or
-   losses), even if such Contributor has been advised of the possibility of
-   such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the
-   Work or Derivative Works thereof, You may choose to offer, and charge a
-   fee for, acceptance of support, warranty, indemnity, or other liability
-   obligations and/or rights consistent with this License. However, in
-   accepting such obligations, You may act only on Your own behalf and on
-   Your sole responsibility, not on behalf of any other Contributor, and
-   only if You agree to indemnify, defend, and hold each Contributor
-   harmless for any liability incurred by, or claims asserted against, such
-   Contributor by reason of your accepting any such warranty or additional
-   liability.
-
-END OF TERMS AND CONDITIONS

LICENSES/exception/BSD-2-Clause.txt

@@ -1,30 +0,0 @@
-Valid-License-Identifier: BSD-2-Clause
-SPDX-URL: https://spdx.org/licenses/BSD-2-Clause.html
-Usage-Guide:
-  To use the BSD 2-clause "Simplified" License put the following SPDX
-  tag/value pair into a comment according to the placement guidelines in
-  the licensing rules documentation:
-    SPDX-License-Identifier: BSD-2-Clause
-License-Text:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

LICENSES/exception/BSD-3-Clause.txt

@@ -1,33 +0,0 @@
-Valid-License-Identifier: BSD-3-Clause
-SPDX-URL: https://spdx.org/licenses/BSD-3-Clause.html
-Usage-Guide:
-  To use the BSD 3-clause "New" or "Revised" License put the following SPDX
-  tag/value pair into a comment according to the placement guidelines in
-  the licensing rules documentation:
-    SPDX-License-Identifier: BSD-3-Clause
-License-Text:
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/preferred/CC-BY-4.0.txt

@@ -1,404 +0,0 @@
-Valid-License-Identifier: CC-BY-4.0
-SPDX-URL: https://spdx.org/licenses/CC-BY-4.0.html
-Usage-Guide:
-  To use the CC-BY-4.0 License put the following SPDX tag/value pair into a
-  comment according to the placement guidelines in the licensing rules
-  documentation:
-    SPDX-License-Identifier: CC-BY-4.0
-License-Text:
-
-Attribution 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.

LICENSES/preferred/CSSL-v1.0.txt

@@ -1,223 +0,0 @@
-                Collaborative Standards Software License v1.0 (CSSL)
-
-LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF
-OPENAIRINTERFACE. The pdf version of this document can be downloaded from
-https://openairinterface.org/oai-cssl/.
-
-1. Definitions.
-
-“License” shall mean the terms and conditions for use, reproduction, and
-distribution set forth in this document.
-
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-“Legal Entity” shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-“Source” form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-“Object” form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-“Work” shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-“Derivative Works” shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-“Contribution” shall mean any work of authorship that is intentionally submitted
-to Licensor for inclusion in the Work by the copyright owner or by an individual
-or Legal Entity authorized to submit on behalf of the copyright owner. For the
-purposes of this definition, “submitted” means any form of electronic, or
-written communication sent to the Licensor or its representatives, including but
-not limited to communication on electronic mailing lists, source code control
-systems, and issue tracking systems that are managed by, or on behalf of, the
-Licensor for the purpose of discussing and improving the Work but excluding
-communication that is conspicuously marked or otherwise designated in writing by
-the copyright owner or entity authorized by the copyright owner as "Not a
-Contribution."
-
-“Contributor License Agreement” shall mean the agreement signed by any
-Contributor setting forth the terms and conditions applicable to its
-Contribution.
-
-“Contributor” shall mean any individual or Legal Entity on behalf of whom a
-Contribution has been received by Licensor and subsequently incorporated within
-the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, Licensor and each
-Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, and distribute the Work
-and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-3.1 Grant of Patent License for study, testing and research purposes:
-
-Subject to the terms and conditions of this License, Licensor and each
-Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section) patent
-license to make, have made, use, and otherwise transfer (excluding selling) the
-Work, solely for study, testing and research purposes, where such license
-applies only to those patent claims licensable by Licensor or such Contributor
-that are necessarily infringed respectively by the Work and/or the said
-Contributor Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted (“Essential Patents”).
-
-3.2 Grant of Patent License for purposes other than study, testing and research:
-
-For purposes other than study, testing and research, and subject to the terms
-and conditions of this License, You commit to be prepared to negotiate, in good
-faith, a non-exclusive, nontransferable, non-assignable license of Essential
-Patents with each Contributor and/or the Licensor on Fair, Reasonable and
-Non-Discriminatory (“FRAND”) terms and conditions for the use of the Work or
-Contribution(s) incorporated within the Work.
-
-3.3 Patent Litigation
-
-If You institute patent litigation against any entity making use of the Work
-solely for study, testing and research purposes (including a cross-claim or
-counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated
-within the Work constitutes direct or contributory patent infringement, then the
-patent licenses granted to You under section 3.1 of this License for that Work
-shall terminate as of the date such litigation is filed.
-
-4. Sublicensing
-
-You may grant sublicenses under the licenses granted under sections 2 and 3.1
-provided that the sublicense is subject to and inclusive of all the terms of and
-rights under this License to which the Work is or was distributed.
-
-5. Redistribution
-
-Subject to terms and conditions set forth in sections 2 and 3, You may reproduce
-and distribute copies of the Work or Derivative Works thereof in any medium,
-with or without modifications, and in Source or Object form, provided that You
-meet the following conditions:
-
-1. You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-
-2. You must cause any modified files by You to carry prominent notices stating
-that You changed the files; and
-
-3. You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-4. If the Work includes a “NOTICE” text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-6. Submission of Contributions.
-
-Any contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions.  Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement such as the
-Contributor License Agreement You may have executed with Licensor regarding such
-Contributions.
-
-7. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-8. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with your exercise of
-permissions under this License.
-
-9. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall Licensor and any
-Contributor, as such, be liable to You for damages, including any direct,
-indirect, special, incidental, or consequential damages of any character arising
-as a result of this License or out of Your use or inability to use the Work
-(including but not limited to damages for loss of goodwill, work stoppage,
-computer failure or malfunction, or any and all other commercial damages or
-losses), even if such Contributor has been advised of the possibility of such
-damages.
-
-10. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor and/or the Licensor,
-and only if You agree to indemnify, defend, and hold each Contributor and/or the
-Licensor harmless for any liability incurred by, or claims asserted against,
-such Contributor and/or Licensor by reason of Your accepting any such warranty
-or additional liability obligations.
-
-END OF TERMS AND CONDITIONS
-
-1. APPENDIX: How to apply the PRESENT License to your work
-
-To apply the present License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets “[]” replaced with your own
-identifying information. (Don’t include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
-third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Standards Software License, version 1.0, terms and conditions
-(the “License”); you may not use this file except in compliance with the
-License. You may obtain a copy of the License at [URL link]
-
-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.

LICENSES/preferred/MIT.txt

@@ -1,28 +0,0 @@
-Valid-License-Identifier: MIT
-SPDX-URL: https://spdx.org/licenses/MIT.html
-Usage-Guide:
-  To use the MIT License put the following SPDX tag/value pair into a
-  comment according to the placement guidelines in the licensing rules
-  documentation:
-    SPDX-License-Identifier: MIT
-License-Text:
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

NOTICE

@@ -1,86 +0,0 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
-The source code is distributed under Collaborative Standards Software License
-(CSSL) v1.0. Some files, such as for orchestration, are distributed under MIT
-license. Documentation is distributed under Creative Commons Attribution 4.0
-International license. All the files without an explicit copyright header have
-an implicit "Copyright of OpenAirInterface Authors".
-
-For more details of the license, refer to the `LICENSES` directory for a list
-of preferred and exceptionally-applied licenses.
-
-However, the source code also contains third party software that is
-acknowledged here for reference.
-
-Credits for source code https://github.com/mouse07410/asn1c:
-Github ID mouse07410: BSD-2-Clause License
-
-Credits for https://github.com/simd-everywhere/simde-no-tests.git:
-Github ID simd-everywhere: MIT License
-
-Credits for source code common/utils/collection/queue.h:
-The Regents of the University of California: BSD 3-Clause Licence
-
-Credits for source code common/utils/collection/tree.h:
-Niels Provos provos@citi.umich.edu: BSD 2-Clause Licence
-
-Credits for openair2/UTIL/OPT/packet-rohc.h:
-Anders Broman <anders.broman@ericsson.com>: GPL-2.0-or-later
-
-Credits for openair3/NAS/COMMON/milenage.h
-Jouni Malinen <j@w1.fi>: BSD 2-Clause License
-
-Credits for source code at:
-- openair1/PHY/CODING/crc.h
-- openair1/PHY/CODING/crcext.h
-- openair1/PHY/CODING/types.h
-- openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_aal/nrLDPC_coding_aal.c
-- openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_aal/nrLDPC_coding_aal.h
-Intel Corporation SPDX-License-Identifier: BSD-3-Clause Licence
-
-Credits for source code nFAPI/open-nFAPI:
-- Most of the files are from CISCO: Apache 2.0 License
-- FAPI/*: CSSL v1.0
-- utils/nfapi_hex_parser.c: CSSL v1.0
-- nfapi/public_inc/nfapi_common_interface.h: CSSL v1.0
-- nfapi/public_inc/nr_nfapi_p7.h: CSSL v1.0
-- nfapi/public_inc/fapi_nr_ue_interface.h: CSSL v1.0
-
-Optional software downloaded on demand/if requested by user:
-
-Credits for Yang model radio/fhi_72/mplane/yang/models:
-O-RAN Alliance: BSD 3-Clause License
-IETF Trust and the persons identified as authors of the code: BSD 2-Clause Licence
-
-Credits for https://github.com/CESNET/libyang:
-Czech Educational and Research Network: BSD-3-Clause License
-
-Credits for https://github.com/CESNET/libnetconf2:
-Czech Educational and Research Network: BSD-3-Clause License
-
-Credits for https://github.com/google/googletest used for unit test:
-Google: BSD 3-Clause License
-
-Credits for https://github.com/google/benchmark used for unit test:
-Google: Apache 2.0 License
-
-Credits for https://github.com/google/sanitizers used for the address sanitizer:
-Google: Apache 2.0 License
-
-Credits for https://github.com/krallin/tini used for init in containers:
-Github ID krallin: MIT License
-
-Credits for https://github.com/EttusResearch/uhd.git:
-EttusResearch: GPLv3 License
-
-Credits for https://github.com/mikefarah/yq used for parsing YAML in Docker images:
-Github ID mikefarah: MIT License
-
-Credits for https://github.com/intel/pf-bb-config:
-Intel: Apache 2.0 License
-
-Credits for https://github.com/Nuand/bladeRF:
-Nuand: https://github.com/Nuand/bladeRF/tree/master?tab=License-1-ov-file
-
-Credits for https://github.com/pothosware/SoapySDR
-Pothosware: BSL 1.0 License

NOTICE.md

@@ -0,0 +1,17 @@
+The source code of openairinterface5g is distributed under **OAI Public License V1.1**.
+
+For more details of the license, refer to [LICENSE](LICENSE) file in the same directory.
+
+However, the source code also contains third party software that is acknowledged here for reference.
+
+## Credits for source code common/utils/collection/queue.h: ##
+
+The Regents of the University of California: BSD 3-Clause Licence.
+
+## Credits for source code common/utils/collection/tree.h: ##
+
+Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
+
+## Credits for source code openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c and nrLDPC_offload.h: ##
+
+Intel Corporation SPDX-License-Identifier: BSD-3-Clause Licence

README.md

@@ -1,15 +1,13 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
 <h1 align="center">
     <a href="https://openairinterface.org/"><img src="https://openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png" alt="OAI" width="550"></a>
 </h1>
 
 <p align="center">
-    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></a>
+    <a href="https://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/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-RHEL9-Green" alt="Supported OS RHEL9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 43"></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">
@@ -33,25 +31,13 @@
 # OpenAirInterface License #
 
  *  [OAI License Model](http://www.openairinterface.org/?page_id=101)
- *  [CSSL v1.0](http://www.openairinterface.org/?page_id=698)
+ *  [OAI License v1.1 on our website](http://www.openairinterface.org/?page_id=698)
 
-The source code is distributed under [**CSSL v1.0**](LICENSE).
-Some files, such as for orchestration, are distributed under
-[MIT license](preferred)(MIT.txt). Documentation is distributed under
-[Creative Commons Attribution 4.0 International license](LICENSES/preferred/CC-BY-4.0.txt).
+It is distributed under **OAI Public License V1.1**.
 
-All the files without an explicit copyright header have an implicit "Copyright
-of OpenAirInterface Authors".
+The license information is distributed under [LICENSE](LICENSE) file in the same directory.
 
-Please see [NOTICE](NOTICE) for other licenses which are used in the software.
-
-In the past OAI source code has been re-licensed sometimes, here is the
-history:
-
-1. CSSL v1.0 starting tag 2026.w14
-2. OAI Public License v1.1 starting tag v1.0 till af4b0d53
-3. OAI Public License v1.0: starting tag v.04 till v1.0
-4. GPL 3: starting tag v.0 till v.04 (only initial implementation of 4G)
+Please see [NOTICE](NOTICE.md) file for third party software that is included in the sources.
 
 # Where to Start #
 
@@ -60,6 +46,7 @@ history:
  *  [System Requirements for Using OAI Stack](./doc/system_requirements.md)
  *  [How to build](./doc/BUILD.md)
  *  [How to run the modems](./doc/RUNMODEM.md)
+ *  [How to test channel emulation mode](CHANNELEMULATOR.md)
 
 Not all information is available in a central place, and information for
 specific sub-systems might be available in the corresponding sub-directories.

build/.pre-commit-config.yaml

@@ -1,20 +0,0 @@
-repos:
-  # Clang-Format: Ensures code style is consistent
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v22.1.3'
-    hooks:
-      - id: clang-format
-
-  # Cppcheck: Static analysis to find bugs
-  - repo: https://github.com/pocc/pre-commit-hooks
-    rev: 'v1.3.5'
-    hooks:
-      - id: cppcheck
-
-  # Basic sanity checks (trailing whitespace, end of file, etc.)
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v6.0.0'
-    hooks:
-      - id: check-added-large-files
-      - id: check-case-conflict
-      - id: end-of-file-fixer

charts/physims-4g/Chart.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 name: oai-physim
 description: A Helm chart for physical simulators network function

charts/physims-4g/charts/physims.4g/Chart.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 name: oai-physims-4g
 description: A Helm subchart for 4G physims network function

charts/physims-4g/charts/physims.4g/templates/_helpers.tpl

@@ -1,5 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-{{/* SPDX-License-Identifier: MIT */}}
 {{/*
 Expand the name of the chart.
 */}}

charts/physims-4g/charts/physims.4g/templates/job.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: batch/v1
 kind: Job
 metadata:

charts/physims-4g/charts/physims.4g/values.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Default values for oai-physims-4g
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

charts/physims-4g/templates/rbac.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

charts/physims-4g/templates/serviceaccount.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/physims-4g/values.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

charts/physims-5g/Chart.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 name: oai-physim
 description: A Helm chart for physical simulators network function

charts/physims-5g/charts/physims.5g/Chart.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 name: oai-physims-5g
 description: A Helm subchart for 5G physims network function

charts/physims-5g/charts/physims.5g/templates/_helpers.tpl

@@ -1,5 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-{{/* SPDX-License-Identifier: MIT */}}
 {{/*
 Expand the name of the chart.
 */}}

charts/physims-5g/charts/physims.5g/templates/job.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: batch/v1
 kind: Job
 metadata:

charts/physims-5g/charts/physims.5g/values.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Default values for oai-physims-5g
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

charts/physims-5g/templates/rbac.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

charts/physims-5g/templates/serviceaccount.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/physims-5g/values.yaml

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

ci-scripts/Jenkinsfile

@@ -1,216 +0,0 @@
-#!/bin/groovy
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-
-def pythonExecutor = params.pythonExecutor
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-def JOB_TIMESTAMP
-
-// Choose test stage name or fallback default
-def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
-
-// 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 sourceRepository = params.eNB_Repository ?: env.GIT_URL
-def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
-def targetRepository = params.Target_Repository ?: sourceRepository
-def targetBranch = params.eNB_TargetBranch ?: 'develop'
-def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
-def is_MR = params.eNB_mergeRequest ?: false
-
-def flexricOption = ""
-def runWithOC = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
-          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
-        }
-        // update the build name and description
-        buildName "${params.eNB_MR}"
-        buildDescription "Branch : ${sourceBranch}"
-      }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            echo "no eNB_SourceCodePath given"
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Opensift Cluster."
-            runWithOC = true
-            if (params.OC_ProjectName == null) {
-              echo "no OC_ProjectName given"
-              allParametersPresent = false
-            }
-          }
-          if (params.Flexric_Tag != null) {
-            echo "This pipeline is configured to run with a FlexRIC deployment."
-            echo "Appending FlexRicTag option to the list of options"
-            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-            echo "Using new Flexric option: ${flexricOption}"
-          }
-
-          echo "CI executor node    :   ${pythonExecutor}"
-          echo "Source Repository   :   ${sourceRepository}"
-          echo "Source Branch       :   ${sourceBranch}"
-          echo "Target Repository   :   ${targetRepository}"
-          echo "Target Branch       :   ${targetBranch}"
-          echo "Commit ID           :   ${commitID}"
-
-          if (allParametersPresent) {
-            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
-            if (is_MR) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${commitID}"
-            }
-          } else {
-            echo "\u274C Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
-            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"
-              }
-            }
-            sh """
-              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
-                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                              ${flexricOption} ${mainPythonAllXmlFiles}
-            """
-            if (runWithOC) {
-              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
-                sh """
-                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
-                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                  ${flexricOption} ${mainPythonAllXmlFiles}
-                """
-                for (xmlFile in myXmlTestSuite) {
-                  if (fileExists(xmlFile)) {
-                    try {
-                      timeout (time: 60, unit: 'MINUTES') {
-                        sh """
-                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
-                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
-                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
-                                          ${flexricOption}
-                        """
-                      }
-                    } catch (Exception e) {
-                      currentBuild.result = 'FAILURE'
-                      buildStageStatus = false
-                    }
-                  }
-                }
-              }
-            } else {
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                    timeout (time: 60, unit: 'MINUTES') {
-                      sh """
-                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
-                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
-                                        ${flexricOption}
-                      """
-                    }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-            }
-          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
-          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_results.html")) {
-              def reportName = "test_results-${env.JOB_NAME}.html"
-              sh "mv test_results.html ${reportName}"
-              sh """
-                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
-                       -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}#' ${reportName}
-	      """
-              archiveArtifacts artifacts: "${reportName}"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-GitLab-Container

@@ -1,6 +1,23 @@
 #!/bin/groovy
 /*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.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
  */
 
 // Location of the executor node
@@ -18,8 +35,6 @@ def gitCommitAuthorEmailAddr
 // list of failing stages
 def failingStages = ""
 
-OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
-
 pipeline {
   agent {
     label nodeExecutor
@@ -34,7 +49,9 @@ pipeline {
     stage ("Verify Parameters") {
       steps {
         script {
-          env.JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
+          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
+          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
+
           echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
           def allParametersPresent = true
 
@@ -110,23 +127,6 @@ pipeline {
         }
       }
     }
-    stage ("Local-Repo-Push") {
-      steps {
-        script {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
-          }
-        }
-      }
-      post {
-        failure {
-          script {
-            echo "Push to local repository KO"
-            failingStages += '\n * RAN-Local-Repo-Push'
-          }
-        }
-      }
-    }
     // Build Stages are Mandatory
     stage ("Image Building Processes") {
       when { expression {doBuild} }
@@ -175,28 +175,6 @@ pipeline {
             }
           }
         }
-        stage ("Ubuntu-Jetson-Image-Builder") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-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
-                ubuntuJetsonBuildStatus = finalizeSlaveJob('RAN-Ubuntu-Jetson-Image-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuJetsonBuildStatus
-              }
-            }
-          }
-        }
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {
@@ -219,6 +197,28 @@ pipeline {
             }
           }
         }
+        stage ("cppcheck") {
+          steps {
+            script {
+              triggerSlaveJob ('RAN-cppcheck', 'cppcheck')
+            }
+          }
+          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')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += cppcheckStatus
+              }
+            }
+          }
+        }
         stage ("ARM-Cross-Compile") {
           steps {
             script {
@@ -243,24 +243,6 @@ pipeline {
         }
       }
     }
-    stage ("DockerHub-Push") {
-      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
-      steps {
-        script {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
-          }
-        }
-      }
-      post {
-        failure {
-          script {
-            echo "Push to Docker-Hub KO"
-            failingStages += '\n * RAN-DockerHub-Push'
-          }
-        }
-      }
-    }
     stage ("Image Test Processes") {
       when { expression {doBuild} }
       parallel {
@@ -287,52 +269,6 @@ pipeline {
             }
           }
         }
-        stage ("PhySim-GraceHopper-5G") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                physimGH5GStatus = finalizeSlaveJob('RAN-PhySim-GraceHopper-5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += physimGH5GStatus
-              }
-            }
-          }
-        }
-        stage ("Channel-Simulation") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Channel-Simulation', 'Channel-Simulation')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                channelSimStatus = finalizeSlaveJob('RAN-Channel-Simulation')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += channelSimStatus
-              }
-            }
-          }
-        }
         stage ("PhySim-Cluster-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -379,29 +315,6 @@ pipeline {
             }
           }
         }
-        stage ("VRT-Sim-Test-5G") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-VRT-Sim-Test-5G', 'VRT-Sim-Test-5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                vrtSim5GStatus = finalizeSlaveJob('RAN-VRT-Sim-Test-5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += vrtSim5GStatus
-              }
-            }
-          }
-        }
         stage ("RF-Sim-Test-5G") {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
@@ -702,11 +615,11 @@ pipeline {
             }
           }
         }
-        stage ("SA-Multi-Antenna-CN5G") {
+        stage ("SA-2x2-Module-CN5G") {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
+              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
             }
           }
           post {
@@ -714,13 +627,13 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saMultiAntennaStatus = finalizeSlaveJob('RAN-SA-Multi-Antenna-CN5G')
+                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saMultiAntennaStatus
+                failingStages += saTDD2x2Status
               }
             }
           }
@@ -748,52 +661,6 @@ pipeline {
             }
           }
         }
-        stage ("SA-Handover-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-Handover-CN5G', 'SA-Handover-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
-                saHandoverStatus = finalizeSlaveJob('RAN-SA-Handover-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saHandoverStatus
-              }
-            }
-          }
-        }
-        stage ("SA-AERIAL-OAIUE-CN5G") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AERIAL-OAIUE-CN5G', 'SA-AERIAL-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
-                saAERIALOAIUEStatus = finalizeSlaveJob('RAN-SA-AERIAL-OAIUE-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saAERIALOAIUEStatus
-              }
-            }
-          }
-        }
         stage ("SA-OAIUE-CN5G") {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
@@ -819,6 +686,23 @@ pipeline {
         }
       }
     }
+    stage ("DockerHub-Push") {
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
+      steps {
+        script {
+          triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
+        }
+      }
+      post {
+        failure {
+          script {
+            echo "Push to Docker-Hub KO"
+            currentBuild.result = 'FAILURE'
+            failingStages += '\n * RAN-DockerHub-Push'
+          }
+        }
+      }
+    }
   }
   post {
     success {
@@ -848,22 +732,25 @@ pipeline {
 // ----  Slave Job functions
 
 def triggerSlaveJob (jobName, gitlabStatusName) {
-  def MR_NUMBER = "MERGE".equals(env.gitlabActionType) ? env.gitlabMergeRequestIid : 'develop'
+  if ("MERGE".equals(env.gitlabActionType)) {
+    MR_NUMBER = env.gitlabMergeRequestIid
+  } else {
+    MR_NUMBER = 'develop'
+  }
   // 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
-  def localStatus = build job: jobName,
+  localStatus = build job: jobName,
     parameters: [
       string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-      string(name: 'SourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
       string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
       string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
       string(name: 'eNB_MR', value: String.valueOf(MR_NUMBER)),
       booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
       string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
     ], propagate: false
-  def localResult = localStatus.getResult()
+  localResult = localStatus.getResult()
   echo "${jobName} Slave Job status is ${localResult}"
   gitlabCommitStatus(name: gitlabStatusName) {
     if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
@@ -879,21 +766,21 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
     shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
     shortenShaOne = shortenShaOne.trim()
     branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
+    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 = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
+    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
-  def localStatus = build job: jobName,
+  localStatus = build job: jobName,
     parameters: [
       string(name: 'FULL_RAN_TAG', value: String.valueOf(fullRanTag))
     ], propagate: false
-  def localResult = localStatus.getResult()
+  localResult = localStatus.getResult()
   echo "${jobName} Slave Job status is ${localResult}"
   gitlabCommitStatus(name: gitlabStatusName) {
     if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
@@ -904,6 +791,34 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
   }
 }
 
+def triggerSlaveJobNoGitLab (jobName) {
+  if ("MERGE".equals(env.gitlabActionType)) {
+    MR_NUMBER = env.gitlabMergeRequestIid
+  } else {
+    MR_NUMBER = 'develop'
+  }
+  // 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: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+      string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+      string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+      string(name: 'eNB_MR', value: String.valueOf(MR_NUMBER)),
+      booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
+      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+    ], propagate: false
+  localResult = localStatus.getResult()
+  echo "${jobName} Slave Job status is ${localResult}"
+  if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+     echo "${jobName} Slave Job is OK"
+  } else {
+     error "${jobName} Slave Job is KO"
+  }
+}
+
 def finalizeSlaveJob(jobName) {
   lock ('Parent-Lock') {
     // In case of any non-success, we are retrieving the HTML report of the last completed
@@ -919,14 +834,12 @@ def finalizeSlaveJob(jobName) {
         filter: 'test_results*.html',
         selector: lastCompleted())
       if (fileExists(fileName)) {
-        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${env.JOB_TIMESTAMP}#' ${fileName}"
-      } else {
-        sh "echo \"could not copy results from ${jobName}, please check pipeline ${BUILD_URL}\" > ${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
       }
-      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

ci-scripts/Jenkinsfile-cluster

@@ -0,0 +1,237 @@
+#!/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
+
+def directoryExistsGlob(fileNameWithGlob) {
+  /* if multiple directories match, will join their names and call fileExists() on that */
+  def dir = sh returnStdout: true, script: 'find . -name \'' + fileNameWithGlob + '\' -type d'
+  dir = dir.replaceAll("\n", "").trim()
+  echo "matching '" + fileNameWithGlob + "' found: '"  + dir + "'"
+  if (dir == "")
+    return false
+  return fileExists(dir)
+}
+
+//-------------------------------------------------------------------------------
+// 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) {
+            echo "no eNB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.eNB_Credentials == null) {
+            echo "no eNB_Credentials given"
+            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}"
+            }
+          } else {
+            echo "no eNB_mergeRequest given - not merging develop"
+          }
+
+          if (params.OC_Credentials == null) {
+            echo "no OC_Credentials given"
+            allParametersPresent = false
+          }
+          if (params.OC_ProjectName == null) {
+            echo "no OC_ProjectName given"
+            allParametersPresent = false
+          }
+          if (params.pythonTestXmlFile == null) {
+            echo "no pythonTestXmlFile given"
+            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"
+            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.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}"
+              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} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                   }
+                  } 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') {
+            if (directoryExistsGlob("build_log_*")) {
+              sh "zip -r -qq build_log_${env.BUILD_ID}.zip build_log_*/*"
+              sh "rm -rf build_log_*/"
+              archiveArtifacts artifacts: "build_log_${env.BUILD_ID}.zip"
+            }
+            if (directoryExistsGlob("test_log_*")) {
+              sh "zip -r -qq test_log_${env.BUILD_ID}.zip test_log_*/*"
+              sh "rm -rf test_log_*/"
+              archiveArtifacts artifacts: "test_log_${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"
+            }
+          }
+        }
+      }
+    }
+  }
+}

ci-scripts/Jenkinsfile-colosseum

@@ -1,6 +1,23 @@
 #!/bin/groovy
 /*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.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
  */
 
 def node = "${params.JenkinsNode}"

ci-scripts/Jenkinsfile-nrue

@@ -0,0 +1,240 @@
+#!/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.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.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} --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_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"
+            }
+          }
+        }
+      }
+    }
+  }  
+}

ci-scripts/Jenkinsfile-physim-deploy

@@ -0,0 +1,231 @@
+#!/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
+          }
+          // 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.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.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} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                   }
+                  } 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_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"
+            }
+          }
+        }
+      }
+    }
+  }  
+}  

ci-scripts/Jenkinsfile-push-local-repo

@@ -1,103 +0,0 @@
-#!/bin/groovy
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def nodeExecutor = params.nodeExecutor
-
-// SSH URL of the internal git repository
-def internalRepoURL = params.internalRepoURL
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-pipeline {
-  agent {
-    label nodeExecutor
-  }
-  options {
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-  stages {
-    stage('Verify parameters') {
-      steps {
-        script {
-          def missingParams = []
-          if (!params.SourceRepo?.trim())       { missingParams << 'SourceRepo' }
-          if (!params.eNB_Branch?.trim())       { missingParams << 'eNB_Branch' }
-          if (!params.eNB_CommitID?.trim())     { missingParams << 'eNB_CommitID' }
-          if (!params.eNB_TargetBranch?.trim()) { missingParams << 'eNB_TargetBranch' }
-          if (!params.eNB_Repository?.trim())   { missingParams << 'eNB_Repository' }
-
-          if (missingParams) {
-            error "Missing required parameters: ${missingParams.join(', ')}"
-          }
-
-          echo "Source Repo   : ${params.SourceRepo}"
-          echo "Source Branch : ${params.eNB_Branch}"
-          echo "Source Commit : ${params.eNB_CommitID}"
-          echo "Target Branch : ${params.eNB_TargetBranch}"
-          echo "Target Repo   : ${params.eNB_Repository}"
-        }
-      }
-    }
-    stage('Prepare workspace') {
-      steps {
-        sh """
-          git config user.email "jenkins@openairinterface.org"
-          git config user.name "OAI Jenkins"
-          git remote remove source || true
-          git remote remove internal-repo || true
-        """
-      }
-    }
-    stage('Add source repo & fetch branches') {
-      steps {
-        sh """
-          git remote add source ${params.SourceRepo} || true
-          git fetch source ${params.eNB_Branch}
-          git fetch origin ${params.eNB_TargetBranch}
-        """
-      }
-    }
-    stage('Create temporary branch for CI') {
-      steps {
-        script {
-          def shortCommit = params.eNB_CommitID.take(8)
-          env.NEW_BRANCH = "${params.eNB_Branch}-${shortCommit}"
-          echo "New branch: ${env.NEW_BRANCH}"
-        }
-        sh """
-          # Checkout source commit
-          git checkout -B ${env.NEW_BRANCH} ${params.eNB_CommitID}
-        """
-      }
-    }
-    stage('Merge target into source') {
-      steps {
-        sh """
-          echo "Merging target branch ${params.eNB_TargetBranch} into source branch ${env.NEW_BRANCH}"
-          if ! git merge --ff origin/${params.eNB_TargetBranch} \
-            -m "Merge ${params.eNB_TargetBranch} into ${params.eNB_Branch} for CI"; then
-            echo "Merge conflicts detected. Aborting."
-            git merge --abort || true
-            exit 1
-          fi
-        """
-      }
-    }
-    stage('Push merged branch to internal repository') {
-      steps {
-        sh """
-          git remote add internal-repo ${internalRepoURL} || true
-          echo "Pushing ${env.NEW_BRANCH} to internal repo"
-          git push --force internal-repo ${env.NEW_BRANCH}
-        """
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-push-registry

@@ -1,6 +1,23 @@
 #!/bin/groovy
 /*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.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
  */
 
 // Location of the python executor node shall be in the same subnet as the others servers
@@ -14,9 +31,6 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Docker Hub account to push to
 def DH_Account = "oaisoftwarealliance"
 
-// internal registry to use
-def OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
-
 pipeline {
   agent {
     label nodeExecutor
@@ -65,22 +79,14 @@ pipeline {
             def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
             // 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 ${OAI_Registry} > /dev/null 2>&1"
+            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
             listOfImages.eachWithIndex { item, iindex ->
-              if (["oai-gnb", "oai-nr-ue", "oai-nr-cuup"].contains(item)) {
-                // For images built on AMD64 and ARMv8 Jetson
-                echo "Pushing image '${item}' for both AMD64 and ARM64 architectures with tags: ${WEEK_TAG} and develop"
-                sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop || true"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:${WEEK_TAG} ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-              } else {
-                sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
-                sh "docker push --quiet ${DH_Account}/${item}:develop"
-                sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
-              }
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
+              sh "docker pull --quiet porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:develop"
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
             }
             // Proxy is not following the same pattern.
             sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
@@ -89,7 +95,7 @@ pipeline {
             sh "docker push --quiet ${DH_Account}/proxy:${WEEK_TAG}"
             sh "docker rmi ${DH_Account}/proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
             // Logging out on both registries
-            sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
+            sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
             sh "docker logout > /dev/null 2>&1"
           }
         }
@@ -99,7 +105,7 @@ pipeline {
   post {
     always {
       script {
-        sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
+        sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
         sh "docker logout > /dev/null 2>&1"
         echo "End of Registry Push"
       }

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -0,0 +1,292 @@
+#!/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 termENB = 0
+def termStatusArray = new Boolean[termENB + 1]
+termStatusArray[termENB] = 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
+
+def doEpcLogCollection = true
+
+
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    options {
+        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'
+                    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
+                    }
+                    // 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 (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 {
+                        currentBuild.result = 'ABORTED'
+                        error('Stopping early because some parameters are missing')
+                    }
+                }
+            }
+        }
+        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/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'],
+                        ]) {
+                            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 --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} --XMLTestFile=${xmlFile}"
+                                  }
+                                } 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 ("Terminate") {
+            parallel {
+                stage('Terminate eNB') {
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termENB] = true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        stage('Log Collection') {
+            parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (eNB - Run)') {
+                    steps {
+                        withCredentials([
+                             [$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}"
+
+                            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"
+                        }
+                        script {
+                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "enb.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"
+                        }
+                    }
+                }
+            }
+        }
+        // Making sure that we really shutdown every thing before leaving
+        failure {
+            script {
+                if (!termStatusArray[termENB]) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                    }
+                }
+            }
+        }
+    }
+}

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -0,0 +1,286 @@
+#!/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()]}
+
+// 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("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'
+                    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
+                    }
+                    // 1st eNB parameters
+                    if (params.eNB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+                    // 2nd eNB parameters
+                    if (params.eNB1_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB1_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB1_Credentials == null) {
+                        allParametersPresent = false
+                    }
+                    // 3rd eNB parameters
+                    if (params.eNB2_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB2_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.eNB2_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 (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/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.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_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 --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} --XMLTestFile=${xmlFile}"
+                                      }
+                                    } 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 ("Terminate") {
+            parallel {
+                stage('Terminate eNB') {
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                        }
+                    }
+                }
+            }
+        }
+        stage('Log Collection') {
+            parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (eNB - Run)') {
+                    steps {
+                        withCredentials([
+                             [$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}"
+
+                            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"
+                        }
+                        script {
+                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "enb.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"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -0,0 +1,274 @@
+#!/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()]}
+
+// 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
+def eNB_TargetBranch
+
+//Status fed to the database
+def StatusForDb = ""
+
+
+pipeline {
+  agent {label pythonExecutor}
+  options {
+    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'
+          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
+          }
+          // 1st eNB parameters
+          if (params.eNB_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB_Credentials == null) {
+            allParametersPresent = false
+          }
+          // 2nd eNB parameters
+          if (params.eNB1_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB1_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB1_Credentials == null) {
+            allParametersPresent = false
+          }
+          // 3rd eNB parameters
+          if (params.eNB2_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB2_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.eNB2_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 (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/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.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_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 --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} --XMLTestFile=${xmlFile}"
+                   }
+                  } 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') {
+      parallel {
+        stage('Log Collection (eNB - Build)') {
+          steps {
+            withCredentials([
+               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+            ]) {
+              echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+              sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+              echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+              sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (eNB - Run)') {
+          steps {
+            withCredentials([
+               [$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}"
+
+              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"
+            }
+            script {
+              if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  post {
+    always {
+      script {
+        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"
+        }
+        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"
+            }
+          }
+        }
+      }
+    }
+  }
+}

ci-scripts/Jenkinsfile-tmp-ran

@@ -0,0 +1,303 @@
+#!/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
+
+def flexricOption = ""
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    options {
+        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'
+                    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
+                    }
+                    // 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.Flexric_Tag != null) {
+                        echo "This pipeline is configured to run with a FlexRIC deployment."
+                        echo "Appending FlexRicTag option to the list of options"
+                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
+                        echo "Using new Flexric option: ${flexricOption}"
+                    }
+
+                    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 if (eNB_CommitID != 'develop') {
+                            sh "git fetch"
+                            sh "git checkout -f ${eNB_CommitID}"
+                        }
+                    } else {
+                        error "Some parameters are missing"
+                    }
+                }
+            }
+        }
+        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/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'],
+                        ]) {
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${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 --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                  }
+                                } 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 ("Terminate") {
+            parallel {
+                stage('Terminate eNB') {
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termENB] = true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        stage('Log Collection') {
+            parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (eNB - Run)') {
+                    steps {
+                        withCredentials([
+                             [$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}"
+
+                            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"
+                        }
+                        script {
+                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "enb.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"
+                        }
+                    }
+                }
+            }
+        }
+        // Making sure that we really shutdown every thing before leaving
+        failure {
+            script {
+                if (!termStatusArray[termENB]) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                    }
+                }
+            }
+        }
+    }
+}

ci-scripts/README.md

@@ -1,62 +0,0 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
-This document outlines how to use the OAI CI framework and gives a quickstart.
-
-[[_TOC_]]
-
-# Quickstart
-
-There is a script `main.py` that
-
-- reads scenario files from XML
-- executes the steps (e.g., deployment of CN/gNB/UE, attach, ping, ...)
-
-To simplify, a script `run_locally.sh` can be used to run a single scenario
-locally.  First, download images for gNB&UE (we assume you already downloaded
-the CN) and tag them "latest", which is expected by `run_locally.sh`:
-
-    docker pull oaisoftwarealliance/oai-gnb:develop
-    docker tag oaisoftwarealliance/oai-gnb:develop oai-gnb
-    docker pull oaisoftwarealliance/oai-nr-ue:develop
-    docker tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue
-
-Now, run the scenario:
-
-    cd ~/openairinterface5g/ci-scripts/
-    ./run_locally.sh xml_files/container_5g_rfsim_simple.xml
-
-Output should look like
-
-```
-[2025-08-07 18:07:49,631]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,631]     INFO:   Creating HTML header 
-[2025-08-07 18:07:49,631]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,766]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,767]     INFO:   Starting Scenario: xml_files/container_5g_rfsim_simple.xml
-[2025-08-07 18:07:49,767]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,767]     INFO: placing all artifacts for this run in /home/richie/oai/cmake_targets/log/container_5g_rfsim_simple.xml.d/
-
-[...]
-
-[2025-08-07 18:07:49,771]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,771]     INFO:  Test ID: 1 (#1)
-[2025-08-07 18:07:49,771]     INFO:  Deploy OAI 5G CoreNetwork
-[2025-08-07 18:07:49,771]     INFO: ----------------------------------------
-```
-
-it will run an end-to-end test, connecting one UE to the gNB, and ping, before
-undeploying. As shown, logs will be under
-`/home/richie/oai/cmake_targets/log/container_5g_rfsim_simple.xml.d/`. The
-python code also produces an HTML report in `ci-scripts/test_results.html`.
-
-# Running with local changes
-
-In order to run the tests as above, with local changes, please [build images
-locally](../docker/README.md).
-
-It is not yet possible to override an existing image with changes made locally
-to a source file and run it directly through the CI framework. However, it is
-possible to override an existing image with local changes, and run the scenario
-manually following the console logs steps provided above. This is described in
-the [5G RFsimulator
-README](yaml_files/5g_rfsimulator/README.md#6-running-with-local-changes).

ci-scripts/args_parse.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 # Python for CI of OAI-eNB + COTS-UE
 #
@@ -15,6 +33,7 @@
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
+import yaml
 import constants as CONST
 
 #-----------------------------------------------------------
@@ -22,10 +41,13 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
+
+
+    py_param_file_present = False
+    py_params={}
 
     force_local = False
-    date_fmt = None
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
 
@@ -37,10 +59,18 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             force_local = True
 
 
+	    #--apply=<filename> as parameters file, to replace inline parameters
+        elif re.match(r'^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
+            py_params_file = matchReg.group(1)
+            with open(py_params_file,'r') as file:
+          	# The FullLoader parameter handles the conversion from YAML
+        	# scalar values to Python dictionary format
+                py_params = yaml.load(file,Loader=yaml.FullLoader)
+                py_param_file_present = True #to be removed once validated
+	    		#AssignParams(py_params) #to be uncommented once validated
+
 	    #consider inline parameters
-        elif re.match(r'^\-\-datefmt=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-datefmt=(.+)$', myArgv, re.IGNORECASE)
-            date_fmt = matchReg.group(1)
         elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
             mode = matchReg.group(1)
@@ -53,6 +83,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             RAN.ranRepository=matchReg.group(1)
             HTML.ranRepository=matchReg.group(1)
             CONTAINERS.ranRepository=matchReg.group(1)
+            SCA.ranRepository=matchReg.group(1)
             CLUSTER.ranRepository=matchReg.group(1)
         elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
@@ -65,6 +96,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
                 RAN.ranAllowMerge=True
                 HTML.ranAllowMerge=True
                 CONTAINERS.ranAllowMerge=True
+                SCA.ranAllowMerge=True
                 CLUSTER.ranAllowMerge=True
         elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
@@ -75,6 +107,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             RAN.ranBranch=matchReg.group(1)
             HTML.ranBranch=matchReg.group(1)
             CONTAINERS.ranBranch=matchReg.group(1)
+            SCA.ranBranch=matchReg.group(1)
             CLUSTER.ranBranch=matchReg.group(1)
         elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
@@ -85,6 +118,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             RAN.ranCommitID=matchReg.group(1)
             HTML.ranCommitID=matchReg.group(1)
             CONTAINERS.ranCommitID=matchReg.group(1)
+            SCA.ranCommitID=matchReg.group(1)
             CLUSTER.ranCommitID=matchReg.group(1)
         elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
@@ -95,28 +129,81 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             RAN.ranTargetBranch=matchReg.group(1)
             HTML.ranTargetBranch=matchReg.group(1)
             CONTAINERS.ranTargetBranch=matchReg.group(1)
+            SCA.ranTargetBranch=matchReg.group(1)
             CLUSTER.ranTargetBranch=matchReg.group(1)
         elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
-            print("parameters --eNB*IPAddress ignored")
+            if re.match(r'^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNBIPAddress=matchReg.group(1)
+                CONTAINERS.eNBIPAddress=matchReg.group(1)
+                SCA.eNBIPAddress=matchReg.group(1)
+                CLUSTER.eNBIPAddress=matchReg.group(1)
+            elif re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB1IPAddress=matchReg.group(1)
+                CONTAINERS.eNB1IPAddress=matchReg.group(1)
+            elif re.match(r'^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB2IPAddress=matchReg.group(1)
+                CONTAINERS.eNB2IPAddress=matchReg.group(1)
         elif re.match(r'^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
-            print("parameters --eNB*UserName ignored")
+            if re.match(r'^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNBUserName=matchReg.group(1)
+                CONTAINERS.eNBUserName=matchReg.group(1)
+                SCA.eNBUserName=matchReg.group(1)
+                CLUSTER.eNBUserName=matchReg.group(1)
+            elif re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB1UserName=matchReg.group(1)
+                CONTAINERS.eNB1UserName=matchReg.group(1)
+            elif re.match(r'^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB2UserName=matchReg.group(1)
+                CONTAINERS.eNB2UserName=matchReg.group(1)
         elif re.match(r'^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --eNB*Password ignored")
+            if re.match(r'^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNBPassword=matchReg.group(1)
+                CONTAINERS.eNBPassword=matchReg.group(1)
+                SCA.eNBPassword=matchReg.group(1)
+                CLUSTER.eNBPassword=matchReg.group(1)
+            elif re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB1Password=matchReg.group(1)
+                CONTAINERS.eNB1Password=matchReg.group(1)
+            elif re.match(r'^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB2Password=matchReg.group(1)
+                CONTAINERS.eNB2Password=matchReg.group(1)
         elif re.match(r'^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBSourceCodePath=matchReg.group(1)
                 CONTAINERS.eNBSourceCodePath=matchReg.group(1)
+                SCA.eNBSourceCodePath=matchReg.group(1)
                 CLUSTER.eNBSourceCodePath=matchReg.group(1)
             elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                print("parameter --eNB1SourceCodePath ignored")
+                matchReg = re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB1SourceCodePath=matchReg.group(1)
+                CONTAINERS.eNB1SourceCodePath=matchReg.group(1)
             elif re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                print("parameter --eNB2SourceCodePath ignored")
+                matchReg = re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+                RAN.eNB2SourceCodePath=matchReg.group(1)
+                CONTAINERS.eNB2SourceCodePath=matchReg.group(1)
         elif re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))
             HTML.testXMLfiles.append(matchReg.group(1))
             HTML.nbTestXMLfiles=HTML.nbTestXMLfiles+1
+        elif re.match(r'^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE): # cleanup
+            print("parameter --UEIPAddress ignored")
+        elif re.match(r'^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
+            print("parameter --UEUserName ignored")
+        elif re.match(r'^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
+            print("parameter --UEPassword ignored")
+        elif re.match(r'^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            print("parameter --UESourceCodePath ignored")
         elif re.match(r'^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
             finalStatus = matchReg.group(1)
@@ -137,6 +224,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
         elif re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
             CLUSTER.OCRegistry = matchReg.group(1)
+        elif re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
+            RAN.BuildId = matchReg.group(1)
         elif re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE)
             CONTAINERS.flexricTag = matchReg.group(1)
@@ -144,4 +234,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return mode, force_local, date_fmt
+    return py_param_file_present, py_params, mode, force_local

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

@@ -5,16 +5,16 @@
 {
 #define N_ANTENNA_DL 1
 #define N_ANTENNA_UL 1
-#define DL_ARFCN 627360
+#define DL_ARFCN 631296
 #define TDD 1
 
-log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_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/config.cfg",
+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 */
@@ -22,6 +22,7 @@ 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,
@@ -46,7 +47,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -61,9 +62,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -77,7 +77,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -92,7 +92,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -107,9 +107,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -123,9 +122,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -139,7 +137,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -154,7 +152,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -169,7 +167,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -184,9 +182,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -200,9 +197,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -216,9 +212,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -232,7 +227,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -247,7 +242,7 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
       apn:"oai",
       attach_pdn_type:"ipv4",
@@ -262,9 +257,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],
@@ -278,9 +272,8 @@ allow dynamic UE creation from remote API */
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
 
-      as_release: 17,
+      as_release: 15,
       ue_category: "nr",
-      redcap: "redcap",
       apn:"oai",
       attach_pdn_type:"ipv4",
       default_nssai: [ { sst: 1, }, ],

ci-scripts/as_ue/config.cfg

@@ -1,47 +0,0 @@
-/* Parameters for SDR device version 2023-06-10
- * Copyright (C) 2015-2023 Amarisoft
- */
-
-#if !defined(N_CELL)
-  #define N_CELL 1
-#endif
-
-#if N_ANTENNA_DL <= 2
-  #define N_CHAN N_CELL
-#else
-  #define N_CHAN 2*N_CELL
-#endif
-
-rf_driver: {
-    name: "sdr",
-
-    /* list of devices. 'dev0' is always the master. */
-#if N_CHAN == 1
-    args: "dev0=/dev/sdr0",
-#elif N_CHAN == 2
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
-#elif N_CHAN == 3
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2",
-#elif N_CHAN == 4
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3",
-#elif N_CHAN == 6
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3,dev4=/dev/sdr4,dev5=/dev/sdr5",
-#else
-    args: "",
-#endif
-
-    /* synchronisation source: internal, gps, external (default = internal) */
-    // sync: "gps",
-    //rx_antenna:"rx", // force to use the RX connector in TDD as RX antenna
-
-    /* PCIe jitter. decrease it to reduce latency */
-    fifo_tx_time: 50,
-    //rx_latency: 30,
-},
-
-#if 0
-  tx_pad_duration:300,
-#endif
-
-tx_gain: 75.0, /* TX gain (in dB) */
-rx_gain: 52.0, /* RX gain (in dB) */

ci-scripts/as_ue/oai_ext_app.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+ue_id="$1"      # UE id
+duration="$2"   # Sim duration
+
+shift
+shift
+
+function end
+{
+    exit 0
+}
+trap end INT TERM
+
+echo "ip netns exec $ue_id $@ > /tmp/test_${ue_id}.log"
+ip netns exec $ue_id $@ > /tmp/test_$ue_id.log
+
+

ci-scripts/attenuatorctl.py

@@ -1,177 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-#!/usr/bin/env python3
-
-import argparse
-import logging
-import itertools
-import usb.core
-import usb.util
-import sys
-import time
-
-logging.basicConfig(
-    level=logging.DEBUG,
-    stream=sys.stdout,
-    format="%(message)s"
-)
-
-# helper class parsing command line options for channels and attenuators
-class ValidateChAtt(argparse.Action):
-    def _parse_channels(s):
-        if len(s.split("-")) == 2:
-            s, e = [int(x) for x in s.split("-")]
-            chs = [x for x in range(s, e+1)]
-            if len(chs) == 0:
-                raise Exception(f"empty range")
-        elif len(s.split(",")) > 1:
-            chs = [int(x) for x in s.split(",")]
-        elif s.isdigit():
-            chs = [int(s)]
-        else:
-            raise Exception(f"could not parse channel expression")
-        for c in chs:
-            if not 1 <= c <= 4:
-                raise Exception(f"channel number must be within [1,4], but have {c}")
-        return chs
-
-    def __call__(self, parse, args, values, option_string=None):
-        ch, att = values
-        try:
-            chs = ValidateChAtt._parse_channels(ch)
-        except Exception as e:
-            parse.exit(1, f"while parsing channel expression {ch}: {e}\n")
-        if not att.isdigit():
-            parse.exit(1, f'expected number for attenuation, but got {att}\n')
-        if not 0 <= int(att) <= 63:
-            parse.exit(1, f'attenuation must be within [0,63], but is {att}\n')
-        opts = getattr(args, self.dest) or {}
-        for c in chs:
-            opts[c] = int(att)
-        setattr(args, self.dest, opts)
-
-def _parse_args() -> argparse.Namespace:
-    epilog = '''
-[CHs] can have the following forms:
-  (1) single channel number w (within [1-4])
-  (2) a range of channels in the form x-y (x <= y)
-  (3) a list of channels in the form a,b,c
-[ATT] must be within [0,63] (dB)
-
---set and --reach are mutually exclusive
-
-Examples:
-- reset all channels to 0: -s 1-4 0
-- set channels 3 and 4 to attenuation 60: -s 3,4 60
-- perform attenuation sweep during 10s, reaching ch. 1+2 to 60: -r 1,2 60 -d 10
-'''
-    parser = argparse.ArgumentParser(description='Mini-Circuit RC*DAT attenuator controller',
-                                     epilog=epilog,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
-
-    parser.add_argument('--info', '-i', action='store_true', default=False,
-                        help='Get Infos for all connected Mini-Circuits RC*DAT',)
-    parser.add_argument('--set', '-s', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Set a fixed attenuation ATT on channels CHs")
-    parser.add_argument('--reach', '-r', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Perform an \"attenuation sweep\": reach attenuation ATT on channels CHs")
-    parser.add_argument('--duration', '-d', action='store', type=float, default=5.0,
-                        help='DURATION for attenuation sweep to --reach given attenuation (Default: 5)',)
-    parser.add_argument('--progress', '-p', action='store_true', default=False,
-                        help='If provided, will show progress during attenuation sweep',)
-    return parser.parse_args()
-
-def _exec(dev, cmd):
-    dev.write(1, cmd)
-    ans = dev.read(0x81,64)
-    # take from ans(wer) while valid bytes
-    sn = itertools.takewhile(lambda x: x < 255 and x > 0, ans)
-    # turn bytes into characters and accumulate into string
-    return "".join(map(chr, sn))
-
-def devId(dev):
-    return f"{dev.idVendor:04x}:{dev.idProduct:04x}"
-
-def _info(dev):
-    ident = devId(dev)
-    SerialN = _exec(dev, "*:SN?")
-    ModelN = _exec(dev, "*:MN?")
-    Fw = _exec(dev, "*:FIRMWARE?")
-
-    logging.info(f'{ident}: model is {ModelN}')
-    logging.info(f'{ident}: serial number is {SerialN}')
-    logging.info(f'{ident}: FW version is {Fw}')
-
-def _get_attenuation(dev):
-    ident = devId(dev)
-    att = _exec(dev, "*:ATT?")
-    # remove leading "*" and split by channels
-    return [float(n) for n in att[1:].split(" ")]
-
-def _set_attenuation(dev, ch_att):
-    ident = devId(dev)
-    for ch, att in ch_att:
-        #logging.debug(f"{ident}: Set attenuation channel {ch}: {att} dB")
-        att = round(4 * att) / 4 # round to closest 0.25dB
-        resp = _exec(dev, f"*:CHAN:{ch}:SETATT:{att};" )
-
-def _continuous_set_attenuation(dev, ch_att_end, duration, show_progress=False, step_duration=0.25):
-    ident = devId(dev)
-
-    current = _get_attenuation(dev)
-    steps = duration / step_duration
-    ch_att_step = [(ch, (att_end - current[ch - 1]) / steps) for ch, att_end in ch_att_end]
-    logging.info(f"{ident}: sweep attenuation during {duration} s in {steps} steps: increments {ch_att_step}")
-    for i in range(1, int(steps)+1):
-        next_att = [(ch, current[ch - 1] + i * att_step) for ch, att_step in ch_att_step]
-        _set_attenuation(dev, next_att)
-        if show_progress:
-            logging.debug(f"{ident}: attenuation for channel(s): {next_att}")
-        time.sleep(step_duration)
-    _set_attenuation(dev, ch_att_end)
-
-def _get_usb_devs(idVendor, idProduct):
-    devs = []
-    for dev in usb.core.find(idVendor=idVendor, idProduct=idProduct, find_all=True):
-        for configuration in dev:
-            for interface in configuration:
-                ifnum = interface.bInterfaceNumber
-                if not dev.is_kernel_driver_active(ifnum):
-                    continue
-                try:
-                    dev.detach_kernel_driver(ifnum)
-                except e:
-                    pass
-        devs.append(dev)
-    return devs
-
-if __name__ == '__main__':
-    # Parse the arguments
-    args = _parse_args()
-    if args.set and args.reach:
-        logging.error("--set and --reach are mutually exclusive")
-        sys.exit(1)
-
-    # 20ce:0023 is Mini-Circuit RC*DAT device
-    devs = _get_usb_devs(idVendor=0x20ce, idProduct=0x0023)
-    if len(devs) == 0:
-        logging.error('no Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    if len(devs) > 1:
-        logging.error('more than one Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    dev = devs[0]
-
-    if args.info:
-        _info(dev)
-
-    if args.set:
-        _set_attenuation(dev, [(k,v) for k,v in args.set.items()])
-
-    if args.reach:
-        _continuous_set_attenuation(dev, [(k,v) for k,v in args.reach.items()], args.duration, args.progress)
-
-    ident = devId(dev)
-    for i, a in enumerate(_get_attenuation(dev)):
-        logging.info(f"{ident}: Attenuation channel {i+1}: {a} dB")
-    sys.exit(0)

ci-scripts/checkAddedWarnings.sh

@@ -1,8 +1,28 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 function usage {
     echo "OAI Warning Check script"
+    echo "   Original Author: Raphael Defosseux"
     echo ""
     echo "Usage:"
     echo "------"

ci-scripts/checkCodingFormattingRules.sh

@@ -1,8 +1,28 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 function usage {
     echo "OAI Coding / Formatting Guideline Check script"
+    echo "   Original Author: Raphael Defosseux"
     echo ""
     echo "   By default (no options) the complete repository will be checked"
     echo "   In case of merge request, provided source and target branch,"
@@ -52,9 +72,9 @@ then
     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 "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FILE || 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|License-Identifier: BSD-3-Clause" $FILE || true`
-       IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $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" || true`
        if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
        then
@@ -163,9 +183,9 @@ do
         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 "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FULLFILE || 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|License-Identifier: BSD-3-Clause" $FULLFILE || true`
-            IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $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" || true`
             if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
             then

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -1,8 +1,28 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 function usage {
     echo "OAI GitLab merge request applying script"
+    echo "   Original Author: Raphael Defosseux"
     echo ""
     echo "Usage:"
     echo "------"

ci-scripts/ci_ctl_adb.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# SPDX-License-Identifier: MIT
 
 usage() {
   echo "usage: $0 <command> <id>"

ci-scripts/ci_ctl_qtel.py

@@ -1,5 +1,22 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 #
 #   Required Python Version

ci-scripts/ci_infra.yaml

@@ -5,20 +5,10 @@ idefix:
   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
-  #Tracing:
-  #  Start: 'sudo rm -f ci_qlog/*; nohup sudo -b QLog/QLog -s ci_qlog -f NR5G.cfg &'
-  #  Stop: 'sudo killall QLog'
-  #  Collect: 'sudo mv ci_qlog/* %%log_dir%%/'
-  IF: wwan0
-  MTU: 1500
-
-raspix:
-  Host: raspix
-  AttachScript: sudo /opt/mbim_scripts/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim_scripts/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
+  Trace: True
+  LogStore: /media/usb-drive/ci_qlogs
 
 up2:
   Host: up2
@@ -56,6 +46,7 @@ adb_ue_1:
   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
@@ -68,14 +59,15 @@ adb_ue_2:
   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
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran %%log_dir%%"
 
 oc-cn5g-20897:
   Host: cacofonix
@@ -85,14 +77,6 @@ oc-cn5g-20897:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
 
-oc-cn5g-00103-ho:
-  Host: groot
-  NetworkScript: echo "inet 172.21.6.111"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho %%log_dir%%"
-
 oc-cn5g-20897-aerial:
   Host: gracehopper1-oai
   NetworkScript: echo "inet 172.21.6.105"
@@ -101,20 +85,12 @@ oc-cn5g-20897-aerial:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial %%log_dir%%"
 
-oc-cn5g-00104:
-  Host: gracehopper1-oai
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial %%log_dir%%"
-
 matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
   RunIperf3Server: False
-  Deploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type start-basic"
-  Undeploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type stop-basic"
+  Deploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type start-basic"
+  Undeploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type stop-basic"
   LogCollect:
     - "docker logs oai-smf > %%log_dir%%/oai-smf.log"
     - "docker logs oai-amf > %%log_dir%%/oai-amf.log"
@@ -143,7 +119,7 @@ ltebox-nano:
     - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 2"
+    - "sleep 1"
   Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 
@@ -154,7 +130,7 @@ sabox-nepes:
     - "sudo su -c 'screen -dm -S simulated_5g_hss /opt/hss_sim0609/start_5g_hss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_sabox < /dev/null &> /dev/null"
-    - "sleep 2"
+    - "sleep 1"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{amfLog.0,ngapcLog.0,ngapcommonLog.0,ngapsLog.0,xGwLog.0,upfLog.0} %%log_dir%%"
   Undeploy: "sudo /opt/ltebox/tools/stop_sabox; sudo killall screen"
 
@@ -165,133 +141,131 @@ ltebox-nepes:
     - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 2"
+    - "sleep 1"
   Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_redcap/aw2s-multi-00102-20.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  #Tracing:
-  #  Start: '' # nothing to be done
-  #  Stop: '' # nothing to be done
-  #  Collect: 'cp /tmp/ue.log %%log_dir%%'
+  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-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
+  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
@@ -304,14 +278,6 @@ oai_ue_caracal:
   IF: oaitun_ue1
   MTU: 1500
 
-oai_ue_jetson2:
-  Host: jetson2-oai
-  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
@@ -333,15 +299,6 @@ rfsim5g_ue:
   AttachScript: docker start rfsim5g-oai-nr-ue
   DetachScript: docker stop rfsim5g-oai-nr-ue
   MTU: 1500
-# for tests with second PDU session ID 2, needs to match requested PDU session name
-rfsim5g_ue_pdu_2:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1p2
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1p2
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
 
 rfsim5g_ue2:
   Host: "%%current_host%%"
@@ -483,93 +440,3 @@ l2sim4g_ext_dn:
   Host: "%%current_host%%"
   NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec l2sim4g-trf-gen
-
-rfsim5g_multiue1:
-  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_multiue2:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue2
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue2
-  AttachScript: true
-  DetachScript: true
-  MTU: 1500
-
-rfsim5g_multiue3:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue3
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue3
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue4:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue4
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue4
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue5:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue5
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue5
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue6:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue6
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue6
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue7:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue7
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue7
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue8:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue8
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue8
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue9:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue9
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue9
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue10:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue10
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue10
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500

ci-scripts/cls_analysis.py

@@ -1,36 +1,90 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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 re
 import os
-import logging
-import yaml
-import signal
 
 import xml.etree.ElementTree as ET
 import json
 
-import importlib, inspect
+# Define the mapping of physim_test values to search patterns
+PHYSIM_PATTERN_MAPPING = {
+	'nr_ulsim': [
+		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
+		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
+	],
+	'nr_dlsim': [
+		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
+		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
+	],
+	'ldpctest': [
+		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
+		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
+	],
+}
+# Define test conditions based on the simulation type
+PHYSIM_TEST_CONDITION = {
+	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
+	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
+	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
+}
 
 class Analysis():
 
-	def _get_test_description(properties):
-		env_vars = None
-		for p in properties:
-			if p["name"] == "ENVIRONMENT":
-				env_vars = p["value"] # save for later if no custom property
-			if p["name"] == "TEST_DESCRIPTION":
-				return p["value"]
-		# if we came till here, it means there is no custom test property
-		# saved in JSON.  See if we have a description in environment variables
-		if not env_vars:
-			return "<none>"
-		for ev in env_vars:
-			name, value = ev.split("=", 1)
-			if name == "TEST_DESCRIPTION":
-				return value
-		return "<none>"
+	def analyze_physim(log, physim_test, options, threshold):
+		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
+		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
+		success = False
+		msg = ''
 
-	def analyze_physim(result_junit, details_json, logPath):
+		try:
+			with open(log, 'r') as f:
+				log_content = f.read()
+		except FileNotFoundError as e:
+			msg = f'{log} file not found, exception: {e}'
+			return False, msg
+		except Exception as e:
+			msg = f'Error while parsing log file {log}: exception: {e}'
+			return False, msg
+
+		if test_condition and test_condition not in log_content:
+			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
+			return False, msg
+
+		time1_match = re.search(search_patterns[0], log_content)
+		time2_match = re.search(search_patterns[1], log_content)
+		if not(time1_match and time2_match):
+			msg = f"Processing time not found in log file {log}."
+			return False, msg
+
+		success = float(time2_match.group(2)) < float(threshold)
+		if success:
+			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
+		else:
+			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
+
+		return success,msg
+
+	def analyze_oc_physim(result_junit, details_json):
 		try:
 			tree = ET.parse(result_junit)
 			root = tree.getroot()
@@ -62,7 +116,7 @@ class Analysis():
 		for test in root: # for each test
 			test_name = test.attrib["name"]
 			test_exec = json_test_desc[test_name]["properties"][1]["value"][0]
-			desc = Analysis._get_test_description(json_test_desc[test_name]["properties"])
+			desc = json_test_desc[test_name]["properties"][1]["value"][1]
 			# get runtime and checks
 			test_check = test.attrib["status"] == "run"
 			time = round(float(test.attrib["time"]), 1)
@@ -70,21 +124,18 @@ class Analysis():
 			output = test.findtext("system-out")
 			output_check = "exceeds the threshold" not in output
 			# collect logs
-			log_dir = f'{logPath}/{test_exec}'
+			log_dir = f'../cmake_targets/log/{test_exec}'
 			os.makedirs(log_dir, exist_ok=True)
 			with open(f'{log_dir}/{test_name}.log', 'w') as f:
 				f.write(output)
 			# prepare result and info
+			info = f"Runtime: {f'{time:.3f}'[:5]} s"
 			resultstr = 'PASS' if (test_check and time_check and output_check) else 'FAIL'
-			info = f"{test_name}.log: test {resultstr}"
-			for l in output.splitlines():
-				if l.startswith("CHECK "):
-					info += f"\n{l}"
 			if test_check:
 				if not output_check:
-					info += "\nTest log exceeds maximal allowed length 100 kB"
+					info += " Test log exceeds maximal allowed length 100 kB"
 				if not time_check:
-					info += "\nTest exceeds 150s"
+					info += " Test exceeds 150s"
 				if not (time_check and output_check):
 					nb_failed += 1 # time threshold/output length error, not counted for by ctest as of now
 			test_result[test_name] = [desc, info, resultstr]
@@ -94,134 +145,3 @@ class Analysis():
 		test_summary['Nbpass'] =  nb_tests - nb_failed
 		test_summary['Nbfail'] =  nb_failed
 		return nb_failed == 0, test_summary, test_result
-
-	def analyze_rt_stats(thresholds, L1_stats, MAC_stats):
-		with open(thresholds, 'r') as f:
-			datalog_rt_stats = yaml.load(f, Loader=yaml.FullLoader)
-
-		rt_keys = datalog_rt_stats['Ref']
-		real_time_stats = {}
-		for sf in [L1_stats, MAC_stats]:
-			with open(sf, 'r') as f:
-				for line in f.readlines():
-					for k in rt_keys:
-						result = re.search(k, line)
-						if result is not None:
-							tmp = re.match(rf'^.*?(\b{k}\b.*)', line.rstrip())
-							if tmp is not None:
-								real_time_stats[k] = tmp.group(1)
-
-		# datalog_rt_stats format must align with HTML.CreateHtmlDataLogTable()
-		datalog_rt_stats['Data']={}
-		for k in real_time_stats:
-			tmp = re.match(r'^(?P<metric>.*):\s+(?P<avg>\d+\.\d+) us;\s+(?P<count>\d+);\s+(?P<max>\d+\.\d+) us;', real_time_stats[k])
-			if tmp is not None:
-				metric = tmp.group('metric')
-				avg = float(tmp.group('avg'))
-				max = float(tmp.group('max'))
-				count = int(tmp.group('count'))
-				datalog_rt_stats['Data'][metric] = ["{:.0f}".format(avg),"{:.0f}".format(max),"{:d}".format(count),"{:.2f}".format(avg / datalog_rt_stats['Ref'][metric])]
-
-		success = True
-		for k in datalog_rt_stats['Data']:
-			valnorm = float(datalog_rt_stats['Data'][k][3])
-			dev = datalog_rt_stats['DeviationThreshold'][k]
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail: avg/ref deviates by more than "deviation threshold"
-				logging.debug(f'\u001B[1;30;43m normalized metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
-				success = False
-		return success, datalog_rt_stats
-
-
-# returns tuple of (service, analyzer, option string)
-def _lookupServiceAnalyzerOpt(s, analyzers):
-	res = s.split("=", 2)
-	name = res[0]
-	if len(res) == 1:
-		return res[0], analyzers["Default"], None
-	opt = res[2] if len(res) > 2 else None
-	func = res[1]
-	a = analyzers[func] if func in analyzers else None
-	return name, a, opt
-
-# groups requested service analysis (service=func[=option]) on per service
-# basis and looks up analyzer func. If log analysis is requested, will always
-# run Default log analysis
-def _groupServices(to_analyze):
-	req_analysis = {}
-	# get content of cls_loganalysis module, then get all analyzers (classes) in this module
-	mod = importlib.import_module("cls_loganalysis")
-	analyzers = {name:cl for name, cl in inspect.getmembers(mod, inspect.isclass)}
-	for req in to_analyze:
-		s, func, opt = _lookupServiceAnalyzerOpt(req, analyzers)
-		logging.debug(f"requested check '{req}' => service {s}, function {func.__name__}, options '{opt}'")
-		# always put default analyzer first
-		l = req_analysis[s] if s in req_analysis else [(analyzers["Default"], None, "default")]
-		if func is not analyzers["Default"]:
-			l.append((func, opt, req))
-		req_analysis[s] = l
-	return req_analysis
-
-def _describe_exit_code(code):
-	if code > 128:
-		sig = code - 128
-		try:
-			return f"terminated by signal {sig} ({signal.Signals(sig).name})"
-		except ValueError:
-			return f"terminated by unknown signal {sig}"
-	else:
-		return f"custom exit code"
-
-def AnalyzeServices(HTML, service_desc, to_analyze):
-	success = True
-	# hack: we want to give as a description "log analysis", but the description
-	# is set outside, so retain what was set before
-	orig_html_desc = HTML.desc
-	# group analysis on a per-service basis, then iterate
-	for serv, list_analysis in _groupServices(to_analyze).items():
-		HTML.desc = f"Log analysis for service {serv}"
-		if serv not in service_desc:
-			success = False
-			logging.error(f"requested service {serv} not in list of services")
-			HTML.CreateHtmlTestRowQueue("N/A", 'KO', ["service not detected"])
-			continue
-		# pre-initialize with return code
-		rc = service_desc[serv]["returncode"]
-		logging.info(f"analyze service {serv}: return code {rc}")
-		service_success = True # TODO rc == 0: too many functions (eNB, lteUE, RIC, nrUE) fail non-zero
-		logs = []
-		if rc != 0:
-			logs.append(f"=> return code {rc}, likely " + _describe_exit_code(rc) + " [ignored by CI]")
-		# skip if the file is too big
-		logfile = service_desc[serv]["logfile"]
-		filename = os.path.basename(logfile)
-		b = os.path.getsize(logfile)
-		logging.debug(f"using logfile {logfile} of size {b} bytes")
-		if b > 10 * 1024 * 1024:
-			success = False
-			logs.append(f"logfile too big (>10MB)")
-			logging.error(logs)
-			HTML.CreateHtmlTestRowQueue(filename, 'KO', ["\n".join(logs)])
-			continue
-		# run each analyzer with its options on the logfile
-		for (func, opt, desc) in list_analysis:
-			if func is None:
-				service_success = False
-				logging.error(f"request analysis function for desc {desc} not found")
-				HTML.CreateHtmlTestRowQueue(serv, 'KO', [f"no analysis function for {desc}"])
-				continue
-			result, l = func.run(logfile, opt)
-			logging.info(f"service {serv}: analysis with func {func}, result {result}, logs '{l}'")
-			service_success = service_success and result
-			if not result:
-				logs.append(f"=> {func.__name__} check (options '{opt}') FAILED")
-				logs.append(l)
-		logs = '\n'.join(logs)
-		if not service_success:
-			logging.error(l)
-		else:
-			logging.info(l)
-		all_funcs = ", ".join([f.__name__ for (f, _, _) in list_analysis])
-		HTML.CreateHtmlTestRowQueue(f"Check {all_funcs} on {filename}", 'OK' if service_success else 'KO', [logs])
-		success = success and service_success
-	HTML.desc = orig_html_desc
-	return success

ci-scripts/cls_ci_helper.py

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-import os
-from typing import NamedTuple
-import logging
-
-class TestCaseCtx(NamedTuple):
-    test_idx: int
-    logPath: str
-
-    def Default(logPath):
-        return TestCaseCtx(112233, logPath)
-    def baseFilename(self):
-        # typically, the test ID is of form 001234 (6 digits)
-        return f"{self.logPath}/{self.test_idx:06d}"
-
-def archiveArtifact(cmd, ctx, remote_path):
-    base = os.path.basename(remote_path)
-    local = f"{ctx.baseFilename()}-{base}"
-    logging.info(f"Archive artifact '{local}'")
-    success = cmd.copyin(remote_path, local)
-    if success:
-        cmd.run(f'rm {remote_path}', silent=True)
-    return local if success else None

ci-scripts/cls_cluster.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 #
 #   Required Python Version
@@ -16,11 +34,11 @@ import time
 import os
 
 import cls_oai_html
+import cls_analysis
 import constants as CONST
 import helpreadme as HELP
 import cls_containerize
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
@@ -50,7 +68,9 @@ def OC_logout(cmd):
 
 class Cluster:
 	def __init__(self):
+		self.eNBIPAddress = ""
 		self.eNBSourceCodePath = ""
+		self.forcedWorkspaceCleanup = False
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
@@ -144,8 +164,27 @@ class Cluster:
 			return -1
 		return int(result.group("size"))
 
+	def _deploy_pod(self, filename, timeout = 120):
+		ret = self.cmd.run(f'oc create -f {filename}')
+		result = re.search(r'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', ret.stdout)
+		if result is None:
+			logging.error(f'could not deploy pod: {ret.stdout}')
+			return None
+		pod = result.group("pod")
+		logging.debug(f'checking if pod {pod} is in Running state')
+		ret = self.cmd.run(f'oc wait --for=condition=ready pod {pod} --timeout={timeout}s', silent=True)
+		if ret.returncode == 0:
+			return pod
+		logging.error(f'pod {pod} did not reach Running state')
+		self._undeploy_pod(filename)
+		return None
+
+	def _undeploy_pod(self, filename):
+		self.cmd.run(f'oc delete -f {filename}')
+
 	def PullClusterImage(self, HTML, node, images, tag_prefix):
 		logging.debug(f'Pull OC image {images} to server {node}')
+		self.testCase_id = HTML.testCase_id
 		with cls_cmd.getConnection(node) as cmd:
 			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
 			if not succeeded:
@@ -168,17 +207,13 @@ class Cluster:
 			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
 		return success
 
-	def _retrieveOCLog(self, ctx, job, lSourcePath, image):
-		fn = f'{lSourcePath}/cmake_targets/log/{image}.log'
-		self.cmd.run(f'oc logs {job} &> {fn}')
-		return (image, archiveArtifact(self.cmd, ctx, fn))
-
-	def BuildClusterImage(self, ctx, node, HTML):
+	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}')
+		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
-		if node == '' or lSourcePath == '':
+		if lIpAddr == '' or lSourcePath == '':
 			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
@@ -189,8 +224,10 @@ class Cluster:
 		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 /')
 
-		logging.debug(f'Building on cluster triggered from server: {node}')
-		self.cmd = cls_cmd.RemoteCmd(node)
+		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
+		self.cmd = cls_cmd.RemoteCmd(lIpAddr)
+
+		self.testCase_id = HTML.testCase_id
 
 		# Workaround for some servers, we need to erase completely the workspace
 		self.cmd.cd(lSourcePath)
@@ -243,45 +280,124 @@ class Cluster:
 		self._recreate_entitlements()
 
 		status = True # flag to abandon compiling if any image fails
-		log_files = []
-		build_metrics = f"{lSourcePath}/cmake_targets/log/build-metrics.log"
+		attemptedImages = []
 		if forceBaseImageBuild:
 			self._recreate_is_tag('ran-base', baseTag, 'openshift/ran-base-is.yaml')
 			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], 1000)
 			if not status: logging.error('failure during build of ran-base')
-			log_files.append(self._retrieveOCLog(ctx, ranbase_job, lSourcePath, '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
+			self._retag_image_statement('ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
+			pod = self._deploy_pod('openshift/ran-base-log-retrieval.yaml')
+			if pod is not None:
+				self.cmd.run(f'mkdir -p cmake_targets/log/ran-base')
+				self.cmd.run(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base')
+				self._undeploy_pod('openshift/ran-base-log-retrieval.yaml')
+			else:
+				status = False
+
+		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')
+			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')
+			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')
+			clang_job = self._start_build('oai-clang')
+			attemptedImages += ['oai-clang']
+
+			wait = ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuild_job, physim_job, clang_job], 1200)
+			if not wait: logging.error('error during build of ranbuild_job or physim_job or clang_job')
+			status = status and wait
+			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
+			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
+			self.cmd.run(f'oc logs {clang_job} &> cmake_targets/log/oai-clang.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
+
+		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')
+			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')
+			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')
+			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
+			attemptedImages += ['oai-gnb-aw2s']
+
+			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 800)
+			if not wait: logging.error('error during build of eNB/gNB')
+			status = status and wait
+			# recover logs
+			self.cmd.run(f'oc logs {enb_job} &> cmake_targets/log/oai-enb.log')
+			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')
+			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')
+			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], 800)
+			if not wait: logging.error('error during build of nr-cuup/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')
 
 		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']
 
-			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')
-			physim_job = self._start_build('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')
-			ranbuild_job = self._start_build('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')
-			clang_job = self._start_build('oai-clang')
-
-			wait = ranbuildfhi72_job is not None and ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuildfhi72_job, ranbuild_job, physim_job, clang_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job or ranbuild_job or physim_job or clang_job')
+			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
-			log_files.append(self._retrieveOCLog(ctx, ranbuildfhi72_job, lSourcePath, 'ran-build-fhi72'))
-			log_files.append(self._retrieveOCLog(ctx, ranbuild_job, lSourcePath, 'ran-build'))
-			log_files.append(self._retrieveOCLog(ctx, physim_job, lSourcePath, 'oai-physim'))
-			log_files.append(self._retrieveOCLog(ctx, clang_job, lSourcePath, 'oai-clang'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			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')
 
 		if status:
 			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
@@ -289,65 +405,19 @@ class Cluster:
 			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']
 
-			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')
-			enb_job = self._start_build('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')
-			gnb_job = self._start_build('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')
-			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
-
-			wait = gnb_fhi72_job is not None and enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([gnb_fhi72_job, enb_job, gnb_job, gnb_aw2s_job], 800)
-			if not wait: logging.error('error during build of eNB/gNB')
+			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
-			log_files.append(self._retrieveOCLog(ctx, gnb_fhi72_job, lSourcePath, 'oai-gnb-fhi72'))
-			log_files.append(self._retrieveOCLog(ctx, enb_job, lSourcePath, 'oai-enb'))
-			log_files.append(self._retrieveOCLog(ctx, gnb_job, lSourcePath, 'oai-gnb'))
-			log_files.append(self._retrieveOCLog(ctx, gnb_aw2s_job, lSourcePath, 'oai-gnb-aw2s'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
-
-			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')
-
-			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')
-			lteue_job = self._start_build('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')
-			nrue_job = self._start_build('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], 800)
-			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
-			status = status and wait
-			# recover logs
-			log_files.append(self._retrieveOCLog(ctx, nr_cuup_job, lSourcePath, 'oai-nr-cuup'))
-			log_files.append(self._retrieveOCLog(ctx, lteue_job, lSourcePath, 'oai-lte-ue'))
-			log_files.append(self._retrieveOCLog(ctx, nrue_job, lSourcePath, 'oai-nr-ue'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			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')
 
 		# split and analyze logs
 		imageSize = {}
-		for image, _ in log_files:
+		for image in attemptedImages:
+			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
 			tag = imageTag if image != 'ran-base' else baseTag
 			size = self._get_image_size(image, tag)
 			if size <= 0:
@@ -358,14 +428,12 @@ class Cluster:
 				imageSize[image] = f'{sizeMb:.1f} Mbytes (uncompressed: ~{sizeMb*2.5:.1f} Mbytes)'
 			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
 
-		archiveArtifact(self.cmd, ctx, build_metrics)
-		logfile = f'{lSourcePath}/cmake_targets/log/image_registry.log'
-		grep_exp = r"\|".join([i for i,f in log_files])
-		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> {logfile}');
-		archiveArtifact(self.cmd, ctx, logfile)
-		logfile = f'{lSourcePath}/cmake_targets/log/build_pod_summary.log'
-		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> {logfile}; done')
-		archiveArtifact(self.cmd, ctx, logfile)
+		grep_exp = r"\|".join(attemptedImages)
+		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log');
+		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> cmake_targets/log/build_pod_summary.log; done')
+
+		build_log_name = f'build_log_{self.testCase_id}'
+		cls_containerize.CopyLogsToExecutor(self.cmd, lSourcePath, build_log_name)
 
 		self.cmd.run('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done')
 
@@ -374,24 +442,55 @@ class Cluster:
 		self.cmd.close()
 
 		# Analyze the logs
-		collectInfo = {}
-		for image, lf in log_files:
-			imgStatus, errors = cls_containerize.AnalyzeBuildLogs(image, lf)
-			info = f"Analysis of {os.path.basename(lf)}: {imgStatus=}, size {imageSize[image]}, {len(errors)} errors"
-			msg = "\n".join([info] + errors)
-			HTML.CreateHtmlTestRowQueue(image, 'OK' if imgStatus else 'KO', [msg])
-			status = status and imgStatus
+		collectInfo = cls_containerize.AnalyzeBuildLogs(build_log_name, attemptedImages, status)
+		for img in collectInfo:
+			for f in collectInfo[img]:
+				status = status and collectInfo[img][f]['status']
+		if not status:
+			logging.debug(collectInfo)
 
 		if status:
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'KO', CONST.ALL_PROCESSES_OK)
 
-		# TODO fix groovy script, remove the following.
-		# the groovy scripts expects all logs in
-		# <jenkins-workspace>/<pipeline>/ci-scripts, so copy it there
-		with cls_cmd.LocalCmd() as c:
-			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_idx}/')
-			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_idx}/')
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, imageSize)
 
 		return status
+
+	def deploy_oc_physim(self, HTML, oc_release, svr_id):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {self.ranBranch} ranCommitID {self.ranCommitID}')
+		image_tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+		logging.debug(f'Running physims from server: {svr_id}')
+		script = "scripts/oc-deploy-physims.sh"
+		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {self.eNBSourceCodePath}"
+		ret = cls_cmd.runScript(svr_id, script, 600, options)
+		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+		log_dir = f'{os.getcwd()}/../cmake_targets/log'
+		os.makedirs(log_dir, exist_ok=True)
+		result_junit = f'{oc_release}-run.xml'
+		details_json = f'{oc_release}-tests.json'
+		with cls_cmd.getConnection(svr_id) as ssh:
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/{details_json}', tgt=f'{log_dir}/{details_json}')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/{result_junit}', tgt=f'{log_dir}/{result_junit}')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt', tgt=f'{log_dir}/physim_log.txt')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/physim_pods_summary.txt', tgt=f'{log_dir}/physim_pods_summary.txt')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/LastTestsFailed.log', tgt=f'{log_dir}/LastTestsFailed.log')
+		test_status, test_summary, test_result = cls_analysis.Analysis.analyze_oc_physim(f'{log_dir}/{result_junit}', f'{log_dir}/{details_json}')
+		if test_summary:
+			if test_status:
+				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+				logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
+			else:
+				HTML.CreateHtmlTestRow('Some test(s) failed!', 'KO', CONST.OC_PHYSIM_DEPLOY_FAIL)
+				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+				logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+		else:
+			HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
+			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+		return test_status

ci-scripts/cls_cmd.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 #
 #   Required Python Version
@@ -27,6 +45,12 @@ def getConnection(host, d=None):
 	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):
@@ -87,12 +111,12 @@ class LocalCmd(Cmd):
 			logging.debug(f'Working dir is {self.cwd}')
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
 
-	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
+	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, cwd=self.cwd, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
+			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:
@@ -214,15 +238,18 @@ class RemoteCmd(Cmd):
 			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
 		return cfg
 
-	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
+	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.debug(f"local> ssh {self.hostname} bash -s {p} < {path} {r}")
+			logging.debug(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 = self.client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
+		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())
@@ -232,6 +259,7 @@ class RemoteCmd(Cmd):
 		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):

ci-scripts/cls_corenetwork.py

@@ -1,5 +1,22 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 #
 #   Required Python Version
@@ -12,7 +29,6 @@ import yaml
 import re
 
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 def listify(s):
 	if s is None:
@@ -60,8 +76,7 @@ class CoreNetwork:
 		words = line[1:].strip().split(" ")
 		script_name = words[0]
 		options = " ".join(words[1:])
-		with cls_cmd.getConnection(host) as c:
-			ret = c.exec_script(script_name, 300, parameters=options, silent=silent)
+		ret = cls_cmd.runScript(host, script_name, 300, parameters=options, silent=silent)
 		return ret
 
 	def _command(self, cmd_list, must_succeed=False, silent=False):
@@ -99,7 +114,8 @@ class CoreNetwork:
 		logging.info(f'deployed core network {self}, pingable IP address {ip}')
 		return True, output
 
-	def _collect_logs(self, ctx):
+	def _collect_logs(self, log_dir):
+		logging.info(f'collecting logs into (local) {log_dir}')
 		remote_dir = "/tmp/cn-undeploy-logs"
 		with cls_cmd.getConnection(self._host) as c:
 			# create a directory for log collection
@@ -118,17 +134,18 @@ class CoreNetwork:
 				logging.error("cannot enumerate log files")
 				return []
 			log_files = []
-			# copy them to the executor one by one
+			# copy them to the executor one by one, and store in log_dir
 			for f in ret.stdout.split("\n"):
-				name = archiveArtifact(c, ctx, f)
-				log_files.append(name)
+				l = f.replace(remote_dir, log_dir)
+				c.copyin(f, l)
+				log_files.append(l)
 			c.run(f'rm -rf {remote_dir}')
 			return log_files
 
-	def undeploy(self, ctx=None):
+	def undeploy(self, log_dir=None):
 		log_files = []
-		if ctx is not None:
-			log_files = self._collect_logs(ctx)
+		if log_dir is not None:
+			log_files = self._collect_logs(log_dir)
 		else:
 			logging.warning("no directory for log collection specified, cannot retrieve core network logs")
 		logging.info(f'undeploy core network {self}')

ci-scripts/cls_loganalysis.py

@@ -1,141 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-import re
-import os
-import logging
-from collections import deque
-
-class Default:
-	def run(file, opt=None):
-		success = True
-		logs = []
-		with open(file, "r") as f:
-			for line in f.readlines():
-				result = re.search('[Aa]ssertion', line)
-				if result:
-					logs.append(line)
-					success = False
-		return success, "\n".join(logs)
-
-class ContainsString:
-	def run(file, needle):
-		with open(file, "r") as f:
-			for line in f.readlines():
-				if re.search(needle, line):
-					return True, ""
-		return False, f"could not find '{needle}' in logs"
-
-class LastLineContains:
-	def run(file, string):
-		with open(file, "r") as f:
-			last_line = deque(f, maxlen=1).pop()
-		success = string in last_line
-		log = "" if success else f"could not find '{string}' in last line"
-		return success, log
-
-class EndsWithBye:
-	def run(file, option):
-		# no option: we ignore any
-		with open(file, "r") as f:
-			n = 0
-			for line in reversed(f.readlines()):
-				if re.search(r'^Bye.\n', line, re.MULTILINE) is not None:
-					return True, ""
-				n = n + 1
-				if n > 50: # if not found in last 50 lines, assume it does not exist
-					break
-		return False, "No Bye. message found, did not stop properly"
-
-class RetxCheck():
-	def _parseList(s):
-		if not s:
-			return []
-		return [int(n) for n in s.split(",")]
-
-	def _get_ul_dl(s):
-		dl, ul = (None, None)
-		for o in s.split(";", 1):
-			if o.startswith("dl="):
-				dl = o[3:]
-			elif o.startswith("ul="):
-				ul = o[3:]
-			else:
-				raise ValueError(f"unrecognized option {s}: needs format '[ul=,dl=]X,Y,...[;ul=Z,V,...]'")
-		return dl, ul
-
-	def _parseRetxCheckers(options):
-		if not "=" in options:
-			dlul = RetxCheck._parseList(options)
-			return dlul, dlul
-		dl, ul = RetxCheck._get_ul_dl(options)
-		return RetxCheck._parseList(dl), RetxCheck._parseList(ul)
-
-	def _analyzeUeRetx(rounds, checkers, regex):
-		perc = list(0 for i in checkers) # results in %
-		stats = list(False for i in checkers) # status if succeeded
-		tmp = re.match(regex, rounds)
-		if tmp is None:
-			logging.error('_analyzeUeRetx: did not match regex for DL retx analysis')
-			return stats
-		retx_data = [float(x) for x in tmp.groups()]
-		for i in range(0, len(perc)):
-			#case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
-			perc[i] = 0 if (retx_data[i] == 0) else 100 * retx_data[i + 1] / retx_data[i]
-			#treating % > 100 , % > requirement
-			stats[i] = perc[i] <= 100 and perc[i] <= checkers[i]
-		return stats
-
-	def _filter_retx_rounds(l):
-		# map to round number if False, else None
-		l = [i+1 if x is False else None for i, x in enumerate(l)]
-		# filter out None
-		return [x for x in l if x is not None]
-
-	def run(file, options):
-		# aggregate statistics per UE
-		dlsch_ulsch_stats = {}
-		status = True
-		with open(file, "r") as f:
-			for line in f.readlines():
-				keys = {'dlsch_rounds','ulsch_rounds'}
-				for k in keys:
-					result = re.search(k, line)
-					if result is None:
-						continue
-					result = re.search('UE (?:RNTI )?([0-9a-f]{4})', line)
-					if result is None:
-						logging.error(f'did not find RNTI while matching key {k}')
-						status = False
-						continue
-					rnti = result.group(1)
-					if not rnti in dlsch_ulsch_stats:
-						dlsch_ulsch_stats[rnti] = {}
-					dlsch_ulsch_stats[rnti][k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
-
-		dl, ul = RetxCheck._parseRetxCheckers(options)
-		msgs = []
-		for ue in dlsch_ulsch_stats:
-			dlulstat = dlsch_ulsch_stats[ue]
-
-			for key in dlulstat:
-				msgs.append(dlulstat[key])
-
-			retx_dl = RetxCheck._analyzeUeRetx(dlulstat['dlsch_rounds'], dl, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
-			retx_ul = RetxCheck._analyzeUeRetx(dlulstat['ulsch_rounds'], ul, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+ulsch_errors\s+(\d+)')
-
-			if False in retx_dl or False in retx_ul:
-				dlstr = RetxCheck._filter_retx_rounds(retx_dl)
-				ulstr = RetxCheck._filter_retx_rounds(retx_ul)
-				msg = f"UE {ue}: retx rounds"
-				if dlstr:
-					msg = f"{msg} DL {dlstr}"
-				if ulstr:
-					msg = f"{msg} UL {ulstr}"
-				msg = f"{msg} exceeded threshold"
-				msgs.append('!!! Failure: ' + msg)
-				logging.error(f'\u001B[1;37;41m {msg}\u001B[0m')
-				status = False
-			else:
-				msg = f"UE {ue} retransmissions within bounds"
-				logging.debug(msg)
-		return status, "\n".join(msgs)

ci-scripts/cls_module.py

@@ -1,5 +1,22 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 #
 #   Required Python Version
@@ -15,7 +32,6 @@ import re
 import yaml
 
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 class Module_UE:
 
@@ -43,31 +59,26 @@ class Module_UE:
 			}
 			self.interface = m.get('IF')
 			self.MTU = m.get('MTU')
+			self.trace = m.get('trace') == True
+			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
 			logging.info(f'initialized UE {self} from {filename}')
 
-			t = m.get('Tracing')
-			self.trace = t is not None
-			if self.trace:
-				if t.get('Start') is None or t.get('Stop') is None or t.get('Collect')is None :
-					raise ValueError("need to have Start/Stop/Collect for tracing")
-				self.cmd_dict["traceStart"] = t.get('Start')
-				self.cmd_dict["traceStop"] = t.get('Stop')
-				self._logCollect = t.get('Collect')
-				if "%%log_dir%%" not in self._logCollect:
-					raise ValueError(f"(At least one) LogCollect expression for {module_name} must contain \"%%log_dir%%\"")
-
 	def __str__(self):
-		return f"{self.module_name}@{self.host}"
+		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
 
 	def __repr__(self):
 		return self.__str__()
 
-	def _command(self, cmd, silent=False, reportNonZero=True):
+	def _command(self, cmd, silent = False):
 		if cmd is None:
 			raise Exception("no command provided")
-		with cls_cmd.getConnection(self.host) as c:
-			response = c.run(cmd, silent=silent, reportNonZero=reportNonZero)
+		if self.host == "" or self.host == "localhost":
+			c = cls_cmd.LocalCmd()
+		else:
+			c = cls_cmd.RemoteCmd(self.host)
+		response = c.run(cmd, silent=silent)
+		c.close()
 		return response
 
 #-----------------$
@@ -75,40 +86,40 @@ class Module_UE:
 #-----------------$
 
 	def initialize(self):
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
+			self._enableTrace()
 		# we first terminate to make sure the UE has been stopped
 		if self.cmd_dict["detach"]:
 			self._command(self.cmd_dict["detach"], silent=True)
 		self._command(self.cmd_dict["terminate"], silent=True)
 		ret = self._command(self.cmd_dict["initialize"])
 		logging.info(f'For command: {ret.args} | return output: {ret.stdout} | Code: {ret.returncode}')
-		if self.trace:
-			self._enableTrace()
 		# Here each UE returns differently for the successful initialization, requires check based on UE
 		return ret.returncode == 0
 
 
-	def terminate(self, ctx=None):
+	def terminate(self):
 		self._command(self.cmd_dict["terminate"])
-		if self.trace and ctx is not None:
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
 			self._disableTrace()
-			return self._collectTrace(ctx)
+			return self._logCollect()
 		return None
 
-	def attach(self, attach_tries = 3, attach_timeout = 40):
+	def attach(self, attach_tries = 4, attach_timeout = 60):
 		ip = None
 		while attach_tries > 0:
 			self._command(self.cmd_dict["attach"])
 			timeout = attach_timeout
 			logging.debug("Waiting for IP address to be assigned")
-			ip = self.getIP(silent=False, reportNonZero=True)
 			while timeout > 0 and not ip:
-				time.sleep(1)
-				timeout -= 1
-				ip = self.getIP(silent=True, reportNonZero=False)
+				time.sleep(5)
+				timeout -= 5
+				ip = self.getIP()
 			if ip:
 				break
 			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
-			attach_timeout += 20
 			attach_tries -= 1
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)
@@ -149,8 +160,8 @@ class Module_UE:
 			logging.error(message)
 			return False
 
-	def getIP(self, silent=True, reportNonZero=True):
-		output = self._command(self.cmd_dict["getNetwork"], silent=silent, reportNonZero=reportNonZero)
+	def getIP(self):
+		output = self._command(self.cmd_dict["getNetwork"], silent=True)
 		result = re.search(r'inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
 		if result and result.group('ip'):
 			ip = result.group('ip')
@@ -180,33 +191,10 @@ class Module_UE:
 		return self.cmd_prefix if self.cmd_prefix else ""
 
 	def _enableTrace(self):
-		logging.info(f'UE {self}: start UE tracing')
-		self._command(self.cmd_dict["traceStart"])
+		raise Exception("not implemented")
 
 	def _disableTrace(self):
-		logging.info(f'UE {self}: stop UE tracing')
-		self._command(self.cmd_dict["traceStop"])
+		raise Exception("not implemented")
 
-	def _collectTrace(self, ctx):
-		remote_dir = "/tmp/ue-trace-logs"
-		with cls_cmd.getConnection(self.host) as c:
-			# create a directory for log collection
-			c.run(f'rm -rf {remote_dir}')
-			ret = c.run(f'mkdir {remote_dir}')
-			if ret.returncode != 0:
-				logging.error("cannot create directory for log collection")
-				return []
-			log_cmd = self._logCollect.replace('%%log_dir%%', remote_dir)
-			self._command(log_cmd)
-			# enumerate collected files
-			ret = c.run(f'ls {remote_dir}/*')
-			if ret.returncode != 0:
-				logging.error("cannot enumerate log files")
-				return []
-			log_files = []
-			# copy them to the executor one by one, and store in log_dir
-			for f in ret.stdout.split("\n"):
-				name = archiveArtifact(c, ctx, f)
-				log_files.append(name)
-			c.run(f'rm -rf {remote_dir}')
-			return log_files
+	def _logCollect(self):
+		raise Exception("not implemented")

ci-scripts/cls_native.py

@@ -1,4 +1,24 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
@@ -8,23 +28,26 @@ import cls_cmd
 import cls_oai_html
 import cls_analysis
 import constants as CONST
-from cls_ci_helper import archiveArtifact
 
-DPDK_PATH = '/opt/dpdk-t2-22.11.0'
+LOG_PATH_PHYSIM = 'phy_sim_logs'
 
 class Native():
 
-	def Build(ctx, node, HTML, directory, options):
-		logging.debug(f'Building on server: {node}')
+	def Build(test_case, HTML, host, directory, options):
+		logging.debug(f'Building on server: {host}')
+		HTML.testCase_id = test_case
 
-		with cls_cmd.getConnection(node) as ssh:
+		with cls_cmd.getConnection(host) as ssh:
 			base = f"{directory}/cmake_targets"
-			ret = ssh.run(f"C_INCLUDE_PATH={DPDK_PATH}/include/ PKG_CONFIG_PATH={DPDK_PATH}/lib64/pkgconfig/ {base}/build_oai {options} > {base}/build_oai.log", timeout=900)
+			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}/build_oai.log", silent=True)
-			logging.debug(f"build finished with code {ret.returncode}")
+			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}")
 
-			archiveArtifact(ssh, ctx, f'{base}/build_oai.log')
+			# 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
@@ -43,3 +66,19 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
+
+	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
+		logging.debug(f'Runnin {physim_test} on server: {host}')
+		workSpacePath = f'{directory}/cmake_targets'
+		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
+		runLogFile=f'physim_{HTML.testCase_id}.log'
+		with cls_cmd.getConnection(host) as cmd:
+			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
+			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
+		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
+		if success:
+			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
+		else:
+			logging.error(msg)
+			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
+		return success

ci-scripts/cls_oai_html.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 # Python for CI of OAI-eNB + COTS-UE
 #
@@ -49,9 +67,19 @@ class HTMLManagement():
 		self.htmlUEFailureMsg = ''
 
 		self.startTime = int(round(time.time() * 1000))
-		self.testCaseIdx = ''
+		self.testCase_id = ''
 		self.desc = ''
 
+		self.OsVersion = ['', '']
+		self.KernelVersion = ['', '']
+		self.UhdVersion = ['', '']
+		self.UsrpBoard = ['', '']
+		self.CpuNb = ['', '']
+		self.CpuModel = ['', '']
+		self.CpuMHz = ['', '']
+
+
+
 #-----------------------------------------------------------
 # HTML structure creation functions
 #-----------------------------------------------------------
@@ -173,7 +201,7 @@ class HTMLManagement():
 			self.htmlFile.write('  <table class="table" border = "1">\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th style="width:5%">Relative Time (s)</th>\n')
-			self.htmlFile.write('        <th style="width:5%">Test Index</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Id</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
 			self.htmlFile.write('        <th style="width:5%">Test Status</th>\n')
@@ -196,11 +224,12 @@ class HTMLManagement():
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
 			self.htmlFile.close()
+			time.sleep(1)
 			if passStatus:
 				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] + r"__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
+				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
 
@@ -229,7 +258,7 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  <p></p>\n')
-			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2026 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
+			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
 			self.htmlFile.write('</div></body>\n')
 			self.htmlFile.write('</html>\n')
 			self.htmlFile.close()
@@ -241,7 +270,7 @@ class HTMLManagement():
 		currentTime = int(round(time.time() * 1000)) - self.startTime
 		self.htmlFile.write('      <tr>\n')
 		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
+		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
 		self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 		self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 		if (str(status) == 'OK'):
@@ -314,6 +343,58 @@ class HTMLManagement():
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
+
+	def CreateHtmlNextTabHeaderTestRow(self, collectInfo, allImagesSize, machine='eNB'):
+		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
+			return
+		self.htmlFile = open('test_results.html', 'a')
+		if bool(collectInfo) == False:
+			self.htmlFile.write('      <tr bgcolor = "red" >\n')
+			self.htmlFile.write('        <td colspan="6"><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+		else:
+			for image in collectInfo:
+				files = collectInfo[image]
+        		# TabHeader for image logs on built shared and target images
+				if allImagesSize[image].count('unknown') > 0:
+					self.htmlFile.write('      <tr bgcolor = "orange" >\n')
+				elif allImagesSize[image].count('Build Failed') > 0:
+					self.htmlFile.write('      <tr bgcolor = "red" >\n')
+				else:
+					self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+				self.htmlFile.write('        <td colspan="6"><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
+				self.htmlFile.write('      </tr>\n')
+				self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
+				self.htmlFile.write('        <th colspan="2">Element</th>\n')
+				self.htmlFile.write('        <th>Nb Errors</th>\n')
+				self.htmlFile.write('        <th>Nb Warnings</th>\n')
+				self.htmlFile.write('        <th colspan="2">Status</th>\n')
+				self.htmlFile.write('      </tr>\n')
+
+				for fil in files:
+					parameters = files[fil]
+					# TestRow for image logs on built shared and target images
+					self.htmlFile.write('      <tr>\n')
+					self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + fil  + ' </td>\n')
+					if (parameters['errors'] == 0):
+						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['errors'])  + '</td>\n')
+					else:
+						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['errors'])  + '</td>\n')
+					if (parameters['errors'] > 0):
+						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')
+					elif (parameters['warnings'] == 0):
+						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['warnings'])  + '</td>\n')
+					else:
+						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
+					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
+						self.htmlFile.write('        <th colspan="2" bgcolor = "green" ><font color="white">OK </font></th>\n')
+					elif (parameters['errors'] == 0):
+						self.htmlFile.write('        <th colspan="2" bgcolor = "orange" ><font color="white">OK </font></th>\n')
+					else:
+						self.htmlFile.write('        <th colspan="2" bgcolor = "red" > NOT OK  </th>\n')
+					self.htmlFile.write('      </tr>\n')
+		self.htmlFile.close()
+
 	#for the moment it is limited to 4 columns, to be made generic later
 	def CreateHtmlDataLogTable(self, DataLog):
 		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
@@ -356,7 +437,7 @@ class HTMLManagement():
 			addOrangeBK = False
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
+			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
 			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 			if (str(status) == 'OK'):
@@ -379,6 +460,90 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 
+	def CreateHtmlTestRowCppCheckResults(self, CCR):
+		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
+			return
+		self.htmlFile = open('test_results.html', 'a')
+		vId = 0
+		for version in CCR.versions:
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"><b> Results for cppcheck v ' + version + ' </b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
+			if CCR.nbErrors[vId] == 0:
+				myColor = 'lightgreen'
+			elif CCR.nbErrors[vId] < 20:
+				myColor = 'orange'
+			else:
+				myColor = 'lightcoral'
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
+			if CCR.nbWarnings[vId] == 0:
+				myColor = 'lightgreen'
+			elif CCR.nbWarnings[vId] < 20:
+				myColor = 'orange'
+			else:
+				myColor = 'lightcoral'
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"> ----------------- </td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbUninitVars[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"> </td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			vId += 1
+
 	def CreateHtmlTestRowPhySimTestResult(self, testSummary, testResult):
 		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
 			return
@@ -431,6 +596,6 @@ class HTMLManagement():
 					self.htmlFile.write('        <td bgcolor = "green" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
 				else:
 					self.htmlFile.write('        <td bgcolor = "red" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
-				self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan"><pre style="display: inline flow-root list-item; margin: 0 3px 0 3px; min-width: 24em;">{value[1]}</pre></td>\n')
+				self.htmlFile.write('        <td bgcolor = "lightcyan">' + value[1] + '</td>\n')
 
 		self.htmlFile.close()

ci-scripts/cls_oaicitest.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 # 
 #
@@ -14,6 +32,7 @@
 #-----------------------------------------------------------
 # Import Libs
 #-----------------------------------------------------------
+import sys		# arg
 import re		# reg
 import time		# sleep
 import os
@@ -22,13 +41,12 @@ import concurrent.futures
 import json
 
 #import our libs
+import helpreadme as HELP
 import constants as CONST
 
 import cls_module
 import cls_corenetwork
-import cls_analysis
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -65,29 +83,6 @@ def Iperf_ComputeTime(args):
 		raise Exception('Iperf time not found!')
 	return int(result.group('iperf_time'))
 
-def convert_to_mbps(value, magnitude):
-	value = float(value)
-	if magnitude == 'K' or magnitude == 'k':
-		return value / 1000
-	elif magnitude == 'M':
-		return value
-	elif magnitude == 'G':
-		return value * 1000
-	else:
-		return value
-
-def extract_iperf_data(res):
-	if not res:
-		return None
-	bitrate_val = res.group('bitrate')
-	magnitude = res.group('magnitude')
-	return {
-		'bitrate_mbps': convert_to_mbps(bitrate_val, magnitude),
-		'jitter': res.group('jitter'),
-		'packetloss': res.group('packetloss'),
-		'bitrate_disp': f'{float(bitrate_val):.2f} {magnitude}bps'
-	}
-
 def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
 	try:
 		with open(filename) as f:
@@ -135,36 +130,53 @@ def Iperf_analyzeV3BIDIRJson(filename):
 	return (True, msg)
 
 def Iperf_analyzeV3UDP(filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
-	if not os.path.isfile(filename):
+	if (not os.path.isfile(filename)):
 		return (False, 'Iperf3 UDP: Log file not present')
-	if os.path.getsize(filename) == 0:
+	if (os.path.getsize(filename)==0):
 		return (False, 'Iperf3 UDP: Log file is empty')
-
-	sender_data = None
-	receiver_data = None
+	sender_bitrate = None
+	receiver_bitrate = None
 	with open(filename, 'r') as server_file:
-		for line in server_file:
-			res_sender = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<magnitude>[kKMG]?)bits\/sec\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>-?\d+)/(?P<sentPack>-?\d+)\s+\((?P<packetloss>[0-9\.eE\-\+]+).*?\s+(sender)', line)
-			res_receiver = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<magnitude>[kKMG]?)bits\/sec\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>-?\d+)/(?P<receivedPack>-?\d+)\s+\((?P<packetloss>[0-9\.eE\-\+]+)%\).*?(receiver)', line)
-			if res_sender:
-				sender_data = extract_iperf_data(res_sender)
-			if res_receiver:
-				receiver_data = extract_iperf_data(res_receiver)
-	if not sender_data or not receiver_data:
-		return (False, 'Could not analyze iperf report')
+		for line in server_file.readlines():
+			res_sender = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]?bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>-?\d+)/(?P<sentPack>-?\d+) \((?P<lost>[0-9\.]+).*?\s+(sender)', line)
+			res_receiver = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]?bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>-?\d+)/(?P<receivedPack>-?\d+)\s+\((?P<lost>[0-9\.]+)%\).*?(receiver)', line)
+			if res_sender is not None:
+				sender_bitrate = res_sender.group('bitrate')
+				sender_unit = res_sender.group('unit')
+				sender_jitter = res_sender.group('jitter')
+				sender_lostPack = res_sender.group('lostPack')
+				sender_sentPack = res_sender.group('sentPack')
+				sender_packetloss = res_sender.group('lost')
+			if res_receiver is not None:
+				receiver_bitrate = res_receiver.group('bitrate')
+				receiver_unit = res_receiver.group('unit')
+				receiver_jitter = res_receiver.group('jitter')
+				receiver_lostPack = res_receiver.group('lostPack')
+				receiver_receivedPack = res_receiver.group('receivedPack')
+				receiver_packetloss = res_receiver.group('lost')
 
-	br_perf = 100 * receiver_data['bitrate_mbps'] / float(target_bitrate)
-	br_perf_str = f'{br_perf:.2f}%'
-	req_msg = f"Sender Bitrate  : {sender_data['bitrate_disp']}"
-	bir_msg = f"Receiver Bitrate: {receiver_data['bitrate_disp']} ({br_perf_str})"
-	jit_msg = f"Jitter          : {receiver_data['jitter']}"
-	pal_msg = f"Packet Loss     : {receiver_data['packetloss']}%"
-	if br_perf < float(iperf_bitrate_threshold):
-		bir_msg += f' (too low! < {iperf_bitrate_threshold}%)'
-	if float(receiver_data['packetloss']) > float(iperf_packetloss_threshold):
-		pal_msg += f' (too high! > {iperf_packetloss_threshold}%)'
-	result = br_perf >= float(iperf_bitrate_threshold) and float(receiver_data['packetloss']) <= float(iperf_packetloss_threshold)
-	return (result, f'{req_msg}\n{bir_msg}\n{jit_msg}\n{pal_msg}')
+	if receiver_bitrate is not None and sender_bitrate is not None:
+		if sender_unit == 'Kbits/sec':
+			sender_bitrate = float(sender_bitrate) / 1000
+		if receiver_unit == 'Kbits/sec':
+			receiver_bitrate = float(receiver_bitrate) / 1000
+		br_perf = 100 * float(receiver_bitrate) / float(target_bitrate)
+		br_perf = '%.2f ' % br_perf
+		sender_bitrate = '%.2f ' % float(sender_bitrate)
+		receiver_bitrate = '%.2f ' % float(receiver_bitrate)
+		req_msg = f'Sender Bitrate  : {sender_bitrate} Mbps'
+		bir_msg = f'Receiver Bitrate: {receiver_bitrate} Mbps'
+		brl_msg = f'{br_perf}%'
+		jit_msg = f'Jitter          : {receiver_jitter}'
+		pal_msg = f'Packet Loss     : {receiver_packetloss} %'
+		if float(br_perf) < float(iperf_bitrate_threshold):
+			brl_msg = f'too low! < {iperf_bitrate_threshold}%'
+		if float(receiver_packetloss) > float(iperf_packetloss_threshold):
+			pal_msg += f' (too high! > {iperf_packetloss_threshold}%)'
+		result = float(br_perf) >= float(iperf_bitrate_threshold) and float(receiver_packetloss) <= float(iperf_packetloss_threshold)
+		return (result, f'{req_msg}\n{bir_msg} ({brl_msg})\n{jit_msg}\n{pal_msg}')
+	else:
+		return (False, 'Could not analyze iperf report')
 
 def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
 		result = None
@@ -178,9 +190,12 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 				result = re.search(statusTemplate, str(line)) or result
 		if result is None:
 			return (False, 'Could not parse server report!')
-		bitrate_val = float(result.group('bitrate'))
-		magnitude = result.group('magnitude')
-		bitrate = convert_to_mbps(bitrate_val, magnitude)
+		bitrate = float(result.group('bitrate'))
+		magn = result.group('magnitude')
+		if magn == "k" or magn == "K":
+			bitrate /= 1000
+		elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+			bitrate *= 1000
 		jitter = float(result.group('jitter'))
 		packetloss = float(result.group('packetloss'))
 		br_perf = float(bitrate)/float(target_bitrate) * 100
@@ -198,7 +213,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 			pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'
 		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
 
-def Custom_Command(HTML, node, command):
+def Custom_Command(HTML, node, command, command_fail):
     logging.info(f"Executing custom command on {node}")
     cmd = cls_cmd.getConnection(node)
     ret = cmd.run(command)
@@ -206,59 +221,35 @@ def Custom_Command(HTML, node, command):
     logging.debug(f"Custom_Command: {command} on node: {node} - {'OK, command succeeded' if ret.returncode == 0 else f'Error, return code: {ret.returncode}'}")
     status = 'OK'
     message = []
-    if ret.returncode != 0:
+    if ret.returncode != 0 and not command_fail:
+        message = [ret.stdout]
+        logging.warning(f'Custom_Command output: {message}')
+        status = 'Warning'
+    if ret.returncode != 0 and command_fail:
         message = [ret.stdout]
         logging.error(f'Custom_Command failed: output: {message}')
         status = 'KO'
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script, args):
+def Custom_Script(HTML, node, script, command_fail):
 	logging.info(f"Executing custom script on {node}")
-	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90, args)
+	ret = cls_cmd.runScript(node, script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
-	if ret.returncode != 0:
+	if ret.returncode != 0 and not command_fail:
+		status = 'Warning'
+	if ret.returncode != 0 and command_fail:
 		status = 'KO'
 	HTML.CreateHtmlTestRowQueue(script, status, message)
 	return status == 'OK' or status == 'Warning'
 
 def IdleSleep(HTML, idle_sleep_time):
-	logging.debug(f"sleep for {idle_sleep_time} seconds")
 	time.sleep(idle_sleep_time)
 	HTML.CreateHtmlTestRow(f"{idle_sleep_time} sec", 'OK', CONST.ALL_PROCESSES_OK)
 	return True
 
-def Deploy_Physim(ctx, HTML, node, workdir, script, options):
-	logging.debug(f'Running physims on server {node} workdir {workdir}')
-	with cls_cmd.getConnection(node) as c:
-		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1500, options)
-	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
-	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
-	with cls_cmd.getConnection(node) as ssh:
-		details_json = archiveArtifact(ssh, ctx, f'{workdir}/desc-tests.json')
-		result_junit = archiveArtifact(ssh, ctx, f'{workdir}/results-run.xml')
-		archiveArtifact(ssh, ctx, f'{workdir}/physim_log.txt')
-		archiveArtifact(ssh, ctx, f'{workdir}/LastTestsFailed.log')
-		archiveArtifact(ssh, ctx, f'{workdir}/LastTest.log')
-	test_status, test_summary, test_result = cls_analysis.Analysis.analyze_physim(result_junit, details_json, ctx.logPath)
-	if test_summary:
-		if test_status:
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-			logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
-		else:
-			HTML.CreateHtmlTestRowQueue('At least one physical simulator test failed!', 'KO', ["See below for details"])
-			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-	else:
-		HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
-		logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-	return test_status
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -271,7 +262,9 @@ class OaiCiTest():
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ''
 
+		self.testCase_id = ''
 		self.testXMLfiles = []
+		self.desc = ''
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
 		self.ping_rttavg_threshold =''
@@ -279,15 +272,18 @@ class OaiCiTest():
 		self.iperf_packetloss_threshold = ''
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
+		self.iperf_options = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
+		self.air_interface=''
 		self.ue_ids = []
+		self.nodes = []
 		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
-	def InitializeUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def InitializeUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -298,8 +294,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		return True
 
-	def AttachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def AttachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -314,8 +310,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
 		return success
 
-	def DetachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def DetachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -323,8 +319,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def DataDisableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataDisableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -337,8 +333,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 		return success
 
-	def DataEnableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataEnableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -352,8 +348,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 		return success
 
-	def CheckStatusUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def CheckStatusUE(self,HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
@@ -362,7 +358,7 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def Ping_common(self, ctx, cn, ue):
+	def Ping_common(self, cn, ue, logPath):
 		ping_status = 0
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -370,12 +366,13 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return (False, f"CN {cn.getName()} has no IP address")
-		ping_log_file = f'/tmp/ping_{ue.getName()}.log'
+		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
 		ping_time = re.findall(r"-c *(\d+)",str(self.ping_args))
+		local_ping_log_file = f'{logPath}/{ping_log_file}'
 		if re.search('%cn_ip%', self.ping_args) or re.search(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+', self.ping_args):
 			raise Exception(f"ping_args should not have IP address: {self.ping_args}")
 		interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
-		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee {ping_log_file}'
+		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
@@ -383,7 +380,8 @@ class OaiCiTest():
 			message = ue_header + ': ping crashed: TIMEOUT?'
 			return (False, message)
 
-		local_ping_log_file = archiveArtifact(cmd, ctx, ping_log_file)
+		#copy the ping log file to have it locally for analysis (ping stats)
+		cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file)
 		cmd.close()
 
 		with open(local_ping_log_file, 'r') as f:
@@ -423,13 +421,18 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		# Creating destination log folder if needed on the python executor workspace
+		with cls_cmd.getConnection('localhost') as local:
+			ymlPath = CONTAINERS.yamlPath[0].split('/')
+			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
+			local.run(f'mkdir -p {logPath}', silent=True)
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Ping_common, ctx, cn, ue) for ue in ues]
+			futures = [executor.submit(self.Ping_common, cn, ue, logPath) for ue in ues]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -450,7 +453,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
 		return success
 
-	def Iperf_Module(self, ctx, cn, ue, idx, ue_num):
+	def Iperf_Module(self, cn, ue, idx, ue_num, logPath):
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
@@ -463,7 +466,7 @@ class OaiCiTest():
 		serverReport = ""
 		udpIperf = re.search('-u', iperf_opt) is not None
 		bidirIperf = re.search('--bidir', iperf_opt) is not None
-		client_filename = f'/tmp/iperf_client_{ue.getName()}.log'
+		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
 		if udpIperf:
 			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
 			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
@@ -478,16 +481,14 @@ class OaiCiTest():
 			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
-			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
+			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
-				# Clean up any existing iperf3 server processes on this port.
-				ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
-				# If pkill succeeds, it means there was a leftover iperf3 server.
-				if ret.returncode == 0:
-					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
-			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
+			# note: copy iperf3 log to the current directory for log analysis and log collection
+			dest_filename = f'{logPath}/{client_filename}'
+			cmd_ue.copyin(f'/tmp/{client_filename}', dest_filename)
+			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False, silent=True)
 		if udpIperf:
 			status, msg = Iperf_analyzeV3UDP(dest_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		elif bidirIperf:
@@ -497,15 +498,20 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}"')
+	def Iperf(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		# create log directory on executor node
+		with cls_cmd.getConnection('localhost') as local:
+			ymlPath = CONTAINERS.yamlPath[0].split('/')
+			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
+			local.run(f'mkdir -p {logPath}', silent=True)
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Iperf_Module, ctx, cn, ue, i, len(ues)) for i, ue in enumerate(ues)]
+			futures = [executor.submit(self.Iperf_Module, cn, ue, i, len(ues), logPath) for i, ue in enumerate(ues)]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -526,10 +532,10 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success
 
-	def Iperf2_Unidir(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip(), node, infra_file)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -537,17 +543,23 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return False
-		server_filename = f'/tmp/iperf_server_{ue.getName()}.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
+		ymlPath = CONTAINERS.yamlPath[0].split('/')
+		logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
 		iperf_time = Iperf_ComputeTime(self.iperf_args)
 		target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(0, 1, self.iperf_profile, self.iperf_args)
 		t = iperf_time*2.5
+		with cls_cmd.getConnection('localhost') as local:
+			local.run(f'mkdir -p {logPath}')
 		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
-			cmd_ue.run(f'rm {server_filename}', reportNonZero=False)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=t)
+			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> /tmp/{server_filename} &', timeout=t)
 			cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 >> /dev/null', timeout=t)
 			localPath = f'{os.getcwd()}'
-			local = archiveArtifact(cmd_ue, ctx, server_filename)
-		success, msg = Iperf_analyzeV2UDP(local, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+			# note: copy iperf2 log to the directory for log collection
+			cmd_ue.copyin(f'/tmp/{server_filename}', f'{logPath}/{server_filename}')
+			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
+		success, msg = Iperf_analyzeV2UDP(f'{logPath}/{server_filename}', self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -558,17 +570,288 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', [f'{ue_header}\n{msg}'])
 		return success
 
-	def TerminateUE(self, ctx, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
+		if (not os.path.isfile(f'{UElogFile}')):
+			return -1
+		ue_log_file = open(f'{UElogFile}', 'r')
+		exitSignalReceived = False
+		foundAssertion = False
+		msgAssertion = ''
+		msgLine = 0
+		foundSegFault = False
+		foundRealTimeIssue = False
+		uciStatMsgCount = 0
+		pdcpDataReqFailedCount = 0
+		badDciCount = 0
+		f1aRetransmissionCount = 0
+		fatalErrorCount = 0
+		macBsrTimerExpiredCount = 0
+		rrcConnectionRecfgComplete = 0
+		no_cell_sync_found = False
+		mib_found = False
+		frequency_found = False
+		plmn_found = False
+		nrUEFlag = False
+		nrDecodeMib = 0
+		nrFoundDCI = 0
+		nrCRCOK = 0
+		mbms_messages = 0
+		nbPduSessAccept = 0
+		nbPduDiscard = 0
+		HTML.htmlUEFailureMsg=''
+		global_status = CONST.ALL_PROCESSES_OK
+		for line in ue_log_file.readlines():
+			result = re.search('nr_synchro_time|Starting NR UE soft modem', str(line))
+			sidelink = re.search('sl-mode', str(line))
+			if result is not None:
+				nrUEFlag = True
+			if sidelink is not None:
+				nrUEFlag = False
+			if nrUEFlag:
+				result = re.search('decode mib', str(line))
+				if result is not None:
+					nrDecodeMib += 1
+				result = re.search('found 1 DCIs', str(line))
+				if result is not None:
+					nrFoundDCI += 1
+				result = re.search('CRC OK', str(line))
+				if result is not None:
+					nrCRCOK += 1
+				result = re.search('Received PDU Session Establishment Accept', str(line))
+				if result is not None:
+					nbPduSessAccept += 1
+				result = re.search('warning: discard PDU, sn out of window', str(line))
+				if result is not None:
+					nbPduDiscard += 1
+				result = re.search('--nfapi STANDALONE_PNF --node-number 2', str(line))
+				if result is not None:
+					frequency_found = True
+			result = re.search('Exiting OAI softmodem', str(line))
+			if result is not None:
+				exitSignalReceived = True
+			result = re.search('System error|[Ss]egmentation [Ff]ault|======= Backtrace: =========|======= Memory map: ========', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Cc]ore [dD]ump', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Aa]ssertion', str(line))
+			if result is not None and not exitSignalReceived:
+				foundAssertion = True
+			result = re.search('LLL', str(line))
+			if result is not None and not exitSignalReceived:
+				foundRealTimeIssue = True
+			if foundAssertion and (msgLine < 3):
+				msgLine += 1
+				msgAssertion += str(line)
+			result = re.search('uci->stat', str(line))
+			if result is not None and not exitSignalReceived:
+				uciStatMsgCount += 1
+			result = re.search('PDCP data request failed', str(line))
+			if result is not None and not exitSignalReceived:
+				pdcpDataReqFailedCount += 1
+			result = re.search('bad DCI 1', str(line))
+			if result is not None and not exitSignalReceived:
+				badDciCount += 1
+			result = re.search('Format1A Retransmission but TBS are different', str(line))
+			if result is not None and not exitSignalReceived:
+				f1aRetransmissionCount += 1
+			result = re.search('FATAL ERROR', str(line))
+			if result is not None and not exitSignalReceived:
+				fatalErrorCount += 1
+			result = re.search('MAC BSR Triggered ReTxBSR Timer expiry', str(line))
+			if result is not None and not exitSignalReceived:
+				macBsrTimerExpiredCount += 1
+			result = re.search('Generating RRCConnectionReconfigurationComplete', str(line))
+			if result is not None:
+				rrcConnectionRecfgComplete += 1
+			# No cell synchronization found, abandoning
+			result = re.search('No cell synchronization found, abandoning', str(line))
+			if result is not None:
+				no_cell_sync_found = True
+			if RAN.eNBmbmsEnables[0]:
+				result = re.search('TRIED TO PUSH MBMS DATA', str(line))
+				if result is not None:
+					mbms_messages += 1
+			result = re.search(r"MIB Information => ([a-zA-Z]{1,10}), ([a-zA-Z]{1,10}), NidCell (?P<nidcell>\d{1,3}), N_RB_DL (?P<n_rb_dl>\d{1,3}), PHICH DURATION (?P<phich_duration>\d), PHICH RESOURCE (?P<phich_resource>.{1,4}), TX_ANT (?P<tx_ant>\d)", str(line))
+			if result is not None and (not mib_found):
+				try:
+					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    nidcell = " + result.group('nidcell')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    n_rb_dl = " + result.group('n_rb_dl')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    phich_duration = " + result.group('phich_duration')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    phich_resource = " + result.group('phich_resource')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    tx_ant = " + result.group('tx_ant')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mib_found = True
+				except Exception as e:
+					logging.error(f'\033[91m MIB marker was not found \033[0m')
+			result = re.search("Initial sync: pbch decoded sucessfully", str(line))
+			if result is not None and (not frequency_found):
+				try:
+					mibMsg = f"UE decoded PBCH successfully"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					frequency_found = True
+				except Exception as e:
+					logging.error(f'\033[91m UE did not find PBCH\033[0m')
+			result = re.search(r"PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
+			if result is not None and (not plmn_found):
+				try:
+					mibMsg = f"PLMN MCC = {result.group('mcc')} MNC = {result.group('mnc')}"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					plmn_found = True
+				except Exception as e:
+					logging.error(f'\033[91m PLMN not found \033[0m')
+			result = re.search(r"Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
+			if result is not None:
+				try:
+					mibMsg = f"The operator is: {result.group('operator')}"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m Operator name not found \033[0m')
+			result = re.search("SIB5 InterFreqCarrierFreq element (.{1,4})/(.{1,4})", str(line))
+			if result is not None:
+				try:
+					mibMsg = f'SIB5 InterFreqCarrierFreq element {result.group(1)}/{result.group(2)}'
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + ' -> '
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m SIB5 InterFreqCarrierFreq element not found \033[0m')
+			result = re.search(r"DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
+			if result is not None:
+				try:
+					freq = result.group('carrier_frequency')
+					new_freq = re.sub('/[0-9]+','',freq)
+					float_freq = float(new_freq) / 1000000
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
+					logging.debug(f'\033[94m    DL Carrier Frequency is:  {freq}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m    DL Carrier Frequency not found \033[0m')
+			result = re.search(r"AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
+			if result is not None:
+				try:
+					prb = result.group('allowed_bandwidth')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + ' -- PRB: ' + prb + '\n'
+					logging.debug(f'\033[94m    AllowedMeasBandwidth: {prb}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m    AllowedMeasBandwidth not found \033[0m')
+		ue_log_file.close()
+		if rrcConnectionRecfgComplete > 0:
+			statMsg = f'UE connected to eNB ({rrcConnectionRecfgComplete}) RRCConnectionReconfigurationComplete message(s) generated)'
+			logging.debug(f'\033[94m{statMsg}\033[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if nrUEFlag:
+			if nrDecodeMib > 0:
+				statMsg = f'UE showed {nrDecodeMib} "MIB decode" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nrFoundDCI > 0:
+				statMsg = f'UE showed {nrFoundDCI} "DCI found" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nrCRCOK > 0:
+				statMsg = f'UE showed {nrCRCOK} "PDSCH decoding" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if not frequency_found:
+				statMsg = 'NR-UE could NOT synch!'
+				logging.error(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nbPduSessAccept > 0:
+				statMsg = f'UE showed {nbPduSessAccept} "Received PDU Session Establishment Accept" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nbPduDiscard > 0:
+				statMsg = f'UE showed {nbPduDiscard} "warning: discard PDU, sn out of window" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if uciStatMsgCount > 0:
+			statMsg = f'UE showed {uciStatMsgCount} "uci->stat" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if pdcpDataReqFailedCount > 0:
+			statMsg = f'UE showed {pdcpDataReqFailedCount} "PDCP data request failed" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if badDciCount > 0:
+			statMsg = f'UE showed {badDciCount} "bad DCI 1(A)" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if f1aRetransmissionCount > 0:
+			statMsg = f'UE showed {f1aRetransmissionCount} "Format1A Retransmission but TBS are different" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if fatalErrorCount > 0:
+			statMsg = f'UE showed {fatalErrorCount} "FATAL ERROR:" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if macBsrTimerExpiredCount > 0:
+			statMsg = f'UE showed {fatalErrorCount} "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if RAN.eNBmbmsEnables[0]:
+			if mbms_messages > 0:
+				statMsg = f'UE showed {mbms_messages} "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			else:
+				statMsg = 'UE did NOT SHOW "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug(f'\u001B[1;30;41m{statMsg}\u001B[0m')
+				global_status = CONST.OAI_UE_PROCESS_NO_MBMS_MSGS
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if foundSegFault:
+			logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
+			if not nrUEFlag:
+				global_status = CONST.OAI_UE_PROCESS_SEG_FAULT
+			else:
+				if not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_SEG_FAULT
+		if foundAssertion:
+			logging.debug('\u001B[1;30;43m UE showed an assertion! \u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE showed an assertion!\n'
+			if not nrUEFlag:
+				if not mib_found or not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_ASSERTION
+			else:
+				if not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_ASSERTION
+		if foundRealTimeIssue:
+			logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE faced real time issues!\n'
+		if nrUEFlag:
+			if not frequency_found:
+				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
+		else:
+			if no_cell_sync_found and not mib_found:
+				logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE could not synchronize!\n'
+				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
+		return global_status
+
+	def TerminateUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(ue.terminate, ctx) for ue in ues]
+			futures = [executor.submit(ue.terminate) for ue in ues]
 			archives = [f.result() for f in futures]
 		archive_info = [f'Log at: {a}' if a else 'No log available' for a in archives]
 		messages = [f"UE {ue.getName()}: {log}" for (ue, log) in zip(ues, archive_info)]
 		HTML.CreateHtmlTestRowQueue(f'N/A', 'OK', messages)
 		return True
 
-	def DeployCoreNetwork(cn_id, ctx, HTML):
+	def DeployCoreNetwork(cn_id, HTML):
 		core_name = cn_id.strip()
 		cn = cls_corenetwork.CoreNetwork(core_name)
 		success, output = cn.deploy()
@@ -582,11 +865,41 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(core_name, 'KO', [msg])
 		return success
 
-	def UndeployCoreNetwork(cn_id, ctx, HTML):
+	def UndeployCoreNetwork(cn_id, HTML):
+		# Ping, Iperf, DeployObject put logs into a path based on YAML. We
+		# can't do this here (because there is no yaml), so hardcode a path for
+		# "cn_logs" for the moment
+		logPath = f'{os.getcwd()}/../cmake_targets/log/cn_logs'
+		with cls_cmd.getConnection('localhost') as local:
+			local.run(f'mkdir -p {logPath}', silent=True)
 		core_name = cn_id.strip()
 		cn = cls_corenetwork.CoreNetwork(core_name)
-		logs, output = cn.undeploy(ctx=ctx)
+		logs, output = cn.undeploy(log_dir=logPath)
 		logging.info(f"undeployed core network {core_name}, logs {logs}, output:\n{output}")
-		message = "Log files:\n" + "\n".join([os.path.basename(l) for l in logs])
+		message = "Log files: " + ", ".join([os.path.basename(l) for l in logs])
 		HTML.CreateHtmlTestRowQueue(core_name, 'OK', [message])
 		return True
+
+	def LogCollectBuild(self,RAN):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if RAN.eNBIPAddress == 'none':
+			sys.exit(0)
+
+		if (RAN.eNBIPAddress != '' and RAN.eNBUserName != '' and RAN.eNBPassword != ''):
+			IPAddress = RAN.eNBIPAddress
+			UserName = RAN.eNBUserName
+			Password = RAN.eNBPassword
+			SourceCodePath = RAN.eNBSourceCodePath
+		else:
+			sys.exit('Insufficient Parameter')
+		with cls_cmd.getConnection(IPAddress) as cmd:
+			d = f'{SourceCodePath}/cmake_targets'
+			cmd.run(f'rm -f {d}/build.log.zip')
+			cmd.run(f'cd {d} && zip -r build.log.zip build_log_*/*')
+
+	def ShowTestID(self):
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
+		logging.info(f'\u001B[1m Test ID: {self.testCase_id} \u001B[0m')
+		logging.info(f'\u001B[1m {self.desc} \u001B[0m')
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')

ci-scripts/cls_static_code_analysis.py

@@ -1,5 +1,23 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 #---------------------------------------------------------------------
 # Python for CI of OAI-eNB + COTS-UE
 #
@@ -25,42 +43,216 @@ from pathlib import Path
 import helpreadme as HELP
 import constants as CONST
 import cls_cmd
-from cls_ci_helper import archiveArtifact
+
+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class CppCheckResults():
+
+	def __init__(self):
+
+		self.variants = ['bionic', 'focal']
+		self.versions = ['','']
+		self.nbErrors = [0,0]
+		self.nbWarnings = [0,0]
+		self.nbNullPtrs = [0,0]
+		self.nbMemLeaks = [0,0]
+		self.nbUninitVars = [0,0]
+		self.nbInvalidPrintf = [0,0]
+		self.nbModuloAlways = [0,0]
+		self.nbTooManyBitsShift = [0,0]
+		self.nbIntegerOverflow = [0,0]
+		self.nbWrongScanfArg = [0,0]
+		self.nbPtrAddNotNull = [0,0]
+		self.nbOppoInnerCondition = [0,0]
 
 class StaticCodeAnalysis():
 
-	def LicenceAndFormattingCheck(ctx, node, HTML, d, branch, allowMerge, targetBranch):
+	def __init__(self):
+
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranAllowMerge = False
+		self.ranCommitID = ''
+		self.ranTargetBranch = ''
+		self.eNBIPAddress = ''
+		self.eNBUserName = ''
+		self.eNBPassword = ''
+		self.eNBSourceCodePath = ''
+
+	def CppCheckAnalysis(self, HTML):
+		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
+		lSourcePath = self.eNBSourceCodePath
+
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('Building on server: ' + lIpAddr)
+		cmd = cls_cmd.getConnection(lIpAddr)
+		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'
+
+		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')
+
+		# 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()
+
+		CCR = CppCheckResults()
+		CCR_ref = CppCheckResults()
+		vId = 0
+		for variant in CCR.variants:
+			refAvailable = False
+			if self.ranAllowMerge:
+				refFolder = str(Path.home()) + '/cppcheck-references'
+				if (os.path.isfile(refFolder + '/cppcheck-'+ variant + '.txt')):
+					refAvailable = True
+					with open(refFolder + '/cppcheck-'+ variant + '.txt', 'r') as refFile:
+						for line in refFile:
+							ret = re.search(' (?P<nb_errors>[0-9\.]+) errors', str(line))
+							if ret is not None:
+								CCR_ref.nbErrors[vId] = int(ret.group('nb_errors'))
+							ret = re.search(' (?P<nb_warnings>[0-9\.]+) warnings', str(line))
+							if ret is not None:
+								CCR_ref.nbWarnings[vId] = int(ret.group('nb_warnings'))
+			if (os.path.isfile('./cppcheck-'+ variant + '.txt')):
+				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))
+						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:
+							xmlStart = True
+						if xmlStart:
+							if re.search('severity="error"', str(line)) is not None:
+								CCR.nbErrors[vId] += 1
+							if re.search('severity="warning"', str(line)) is not None:
+								CCR.nbWarnings[vId] += 1
+							if re.search('id="memleak"', str(line)) is not None:
+								CCR.nbMemLeaks[vId] += 1
+							if re.search('id="nullPointer"', str(line)) is not None:
+								CCR.nbNullPtrs[vId] += 1
+							if re.search('id="uninitvar"', str(line)) is not None:
+								CCR.nbUninitVars[vId] += 1
+							if re.search('id="invalidPrintfArgType_sint"|id="invalidPrintfArgType_uint"', str(line)) is not None:
+								CCR.nbInvalidPrintf[vId] += 1
+							if re.search('id="moduloAlwaysTrueFalse"', str(line)) is not None:
+								CCR.nbModuloAlways[vId] += 1
+							if re.search('id="shiftTooManyBitsSigned"', str(line)) is not None:
+								CCR.nbTooManyBitsShift[vId] += 1
+							if re.search('id="integerOverflow"', str(line)) is not None:
+								CCR.nbIntegerOverflow[vId] += 1
+							if re.search('id="wrongPrintfScanfArgNum"|id="invalidScanfArgType_int"', str(line)) is not None:
+								CCR.nbWrongScanfArg[vId] += 1
+							if re.search('id="pointerAdditionResultNotNull"', str(line)) is not None:
+								CCR.nbPtrAddNotNull[vId] += 1
+							if re.search('id="oppositeInnerCondition"', str(line)) is not None:
+								CCR.nbOppoInnerCondition[vId] += 1
+			vMsg  = ''
+			vMsg += '========  Variant ' + variant + ' - ' + CCR.versions[vId] + ' ========\n'
+			vMsg += '   ' + str(CCR.nbErrors[vId]) + ' errors\n'
+			vMsg += '   ' + str(CCR.nbWarnings[vId]) + ' warnings\n'
+			vMsg += '  -- Details --\n'
+			vMsg += '   Memory leak:                     ' + str(CCR.nbMemLeaks[vId]) + '\n'
+			vMsg += '   Possible null pointer deference: ' + str(CCR.nbNullPtrs[vId]) + '\n'
+			vMsg += '   Uninitialized variable:          ' + str(CCR.nbUninitVars[vId]) + '\n'
+			vMsg += '   Undefined behaviour shifting:    ' + str(CCR.nbTooManyBitsShift[vId]) + '\n'
+			vMsg += '   Signed integer overflow:         ' + str(CCR.nbIntegerOverflow[vId]) + '\n'
+			vMsg += '\n'
+			vMsg += '   Printf formatting issue:         ' + str(CCR.nbInvalidPrintf[vId]) + '\n'
+			vMsg += '   Modulo result is predetermined:  ' + str(CCR.nbModuloAlways[vId]) + '\n'
+			vMsg += '   Opposite Condition -> dead code: ' + str(CCR.nbOppoInnerCondition[vId]) + '\n'
+			vMsg += '   Wrong Scanf Nb Args:             ' + str(CCR.nbWrongScanfArg[vId]) + '\n'
+			for vLine in vMsg.split('\n'):
+				logging.debug(vLine)
+			if self.ranAllowMerge and refAvailable:
+				if CCR_ref.nbErrors[vId] == CCR.nbErrors[vId]:
+					logging.debug('   No change in number of errors')
+				elif CCR_ref.nbErrors[vId] > CCR.nbErrors[vId]:
+					logging.debug('   Good! Decrease in number of errors')
+				else:
+					logging.debug('   Bad! increase in number of errors')
+				if CCR_ref.nbWarnings[vId] == CCR.nbWarnings[vId]:
+					logging.debug('   No change in number of warnings')
+				elif CCR_ref.nbWarnings[vId] > CCR.nbWarnings[vId]:
+					logging.debug('   Good! Decrease in number of warnings')
+				else:
+					logging.debug('   Bad! increase in number of warnings')
+			# Create new reference file
+			if not self.ranAllowMerge:
+				refFolder = str(Path.home()) + '/cppcheck-references'
+				if not os.path.isdir(refFolder):
+					os.mkdir(refFolder)
+				with open(refFolder + '/cppcheck-'+ variant + '.txt', 'w') as refFile:
+					refFile.write(vMsg)
+			vId += 1
+
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		HTML.CreateHtmlTestRowCppCheckResults(CCR)
+		logging.info('\u001B[1m Static Code Analysis Pass\u001B[0m')
+
+		return True
+
+	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
+		lIpAddr = self.eNBIPAddress
+		lUserName = self.eNBUserName
+		lPassWord = self.eNBPassword
+		lSourcePath = self.eNBSourceCodePath
+
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('Building on server: ' + lIpAddr)
+		cmd = cls_cmd.getConnection(lIpAddr)
+		self.testCase_id = HTML.testCase_id
 
-		if not node or not d:
-			raise ValueError(f"{d=} {node=}")
-		logging.debug('Building on server: ' + node)
-		cmd = cls_cmd.getConnection(node)
 		check_options = ''
-		if allowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={branch}'
-			if targetBranch == '':
-				if branch != 'develop' and branch != 'origin/develop':
+		if self.ranAllowMerge:
+			check_options = f'--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'
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={targetBranch}'
+				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
 
-		logDir = f'{d}/cmake_targets/log/'
+		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 {d}/ci-scripts/docker/Dockerfile.formatting.ubuntu {d} > {logDir}/oai-formatting-check.txt 2>&1')
+		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')
 
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')
 		cmd.run('docker volume prune --force')
 
-		file = archiveArtifact(cmd, ctx, f'{logDir}/oai-formatting-check.txt')
+		# Analyzing the logs
+		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
 		cmd.close()
 
 		finalStatus = 0
-		if (os.path.isfile(file)):
+		if (os.path.isfile('./oai-formatting-check.txt')):
 			analyzed = False
 			nbFilesNotFormatted = 0
 			listFiles = False
@@ -71,7 +263,7 @@ class StaticCodeAnalysis():
 			gnuGplLicenceFiles = []
 			suspectLicence = False
 			suspectLicenceFiles = []
-			with open(file, 'r') as logfile:
+			with open('./oai-formatting-check.txt', 'r') as logfile:
 				for line in logfile:
 					ret = re.search('./ci-scripts/checkCodingFormattingRules.sh', str(line))
 					if ret is not None:

ci-scripts/colosseum_scripts/README.md

@@ -1,5 +1,3 @@
-<!-- SPDX-License-Identifier: CC-BY-4.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.

ci-scripts/colosseum_scripts/check-results.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 set -x
 

ci-scripts/colosseum_scripts/get-test-results.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 set -eu
 

ci-scripts/colosseum_scripts/launch-job.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 set -eu
 

ci-scripts/colosseum_scripts/set-job-status.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 set -eu
 

ci-scripts/colosseum_scripts/wait-job-end.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.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
+# */
 
 set -xeu
 

ci-scripts/conf_files/README.md

@@ -1,5 +1,3 @@
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-
 # Configuration files: naming style guide
 
 The configuration files should have the following name format:

ci-scripts/conf_files/channelmod_rfsimu.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "rcc-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "rcc-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 RUs =
 (
   {

ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 RUs =
 (
   {

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB_Eurecom_LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -202,11 +200,9 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-B38");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-B38");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-B38");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom_LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -235,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.25prb.l2sim.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "enb-l2sim-vnf");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -235,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -235,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -235,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
@@ -364,11 +362,9 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
 Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";