Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c

Conflicts:
	targets/RT/USER/lte-uesoftmodem.c

Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

  -- calling twice phy-sim test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- Corrected the long option version for variant in test run script
  -- added proper test in zip command in pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

CI: running physical simulator tests

See merge request oai/openairinterface5g!334

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- on physical simulators
  -- no proper report yet
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

CI: fixing typos

See merge request oai/openairinterface5g!333

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

CI: adding Ethernet-transport variants to build

See merge request oai/openairinterface5g!332

  -- fix cmake file for missing header in --noS1 option
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- VM are kept alive to prepare for running tests
  -- Added destroy script to kill all VM after run
  -- VM names are now based on jobname and buildid
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

We have to not call that function here because
it blocks everything if number of proc > 4.

CI: stability fix

See merge request oai/openairinterface5g!328

  -- when unzip, added --DD option: skip restoration of timestamps for all extracted items.
     should resolve clock skew issues
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

eNb CI Integration Job builds using temporary virtual machines in parallel

See merge request oai/openairinterface5g!327

  -- remove extra build options (not necessary anymore)
  -- fix in reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- missing phy simulator logs in artifacts
  -- enhancement on HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- new stage in parallel on a VM
  -- detailed reporting of CPPCHECK
  -- Option to keep vm alive after build (not used yet on jenkins pipeline)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

 -- Added VM-build support for physical simulators
 -- More details in the reported HTML files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

 -- quieter zip of the repository
 -- remove clock skew and flexran.proto in the warning count
 -- increase to 4 CPU on VM
 -- created a new template to use host cpu properties (resolve AXV2 compilation issue)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Summary of changes:
- import work from Fujitsu:
    - multiple UEs
    - TDD configuration 1
- several bugs fixed:
    - UE power changes
      this one introduces two new parameters in the configuration file,
      update yours! The new parameters are "puSch10xSnr" and "puCch10xSnr".
      See targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
    - IQ replay module
    - use MAKE_VERSION(x,y,z) instead of RRC_VERSION
    - some UE fixes

Some new problems may happen. The work from Fujitsu was huge
and their branch diverged a lot from develop, leading to a very
complex merge.

The UE power management may also have an impact. It expects the noise
level to be at around 30 (as seen in the enb T tracer, in the
"input signal" view) and asks for an SNR of 20dB (value 200 for puSch10xSnr
and puCch10xSnr in the configuration file). You may want to put a
lower value, say 100 (SNR of 10dB). This is still work in progress
and needs some more work (we need to calculate the noise level at
runtime and not use a hardcoded value of 30).