Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c

See merge request oai/openairinterface5g!595

The following Merge Requests are included:

* MR 544: RRC Inactivity Timer testing
* MR 581: Remove deprecated build options
* MR 583: RRC: add an option to enable measurement reports
* MR 590: bugfix UE realtime bug

  -- scenarios were using FDD 5MHz conf file w/ active RRC inactivity timeout
  -- since we are waiting very long that UE is sync'ed w/ eNB, timeout occurs and UE is released
  -- solution is to disable timeouts in command line in scenario
  -- also python is fixed to handle properly wrong ping exits

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

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

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

Merge remote-tracking branch 'origin/issue425_buildsimplification' into develop_integration_2019_w21

Merge remote-tracking branch 'origin/RRC-Inactivity-timers-testing' into develop_integration_2019_w21

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

When pushing traffic with iperf the UE was crashing.

The argument passed to pthread_mutex_timedlock is absolute time based
on the CLOCK_REALTIME timer, not relative time. That seems to be the
root cause of the bug. (That there is a timeout is another story.)

This commit uses absolute value.

Also we separate cases between IS_SOFTMODEM_BASICSIM / IS_SOFTMODEM_RFSIM
and standard realtime UE. In the 'sim' modes we don't care about
timeout and just call pthread_mutex_lock. It seems to be the idea
of the original work. If not, then to be fixed.

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

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

 # Please enter the commit message for your changes. Lines starting

More build_oai cleanup, add a generic option "--build-lib" to build optional shared libraries (telnet server for example)

fix crash when attempting to use -d legacy softscope. Doesn't fix all problems but at least no crash and ready for anybody to fix diplay problems

Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER

  -- in python: detection of a build failure, the tab should close nicely
  -- L2-nFAPi simulator: adding the num-ue-thread option
  -- Moved the VM destroy stage into the "VM-based test" branch.
  -- On "slave" job pipeline, moved the XML parsing after the git merge step so new test-cases are nicely taken care of.

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

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

  -- in python: detection of a build failure, the tab should close nicely
  -- L2-nFAPi simulator: adding the num-ue-thread option
  -- Moved the VM destroy stage into the "VM-based test" branch.
  -- On "slave" job pipeline, moved the XML parsing after the git merge step so new test-cases are nicely taken care of.

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

In the configuration file, to enable measurements, add:

    enable_measurement_reports = "yes";

Note that if x2 is enabled then the option 'enable_measurement_reports'
is not taken into account and the measurements are enabled.

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

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

configuration files for CU/DU (thread policy)

Update doc, remove color escape sequences from logs (use character to identify message level), try to fix basic simu Pb

Fix NB_PATTERN_FILES and BUILD_OPTIONS in oai-ci-vm-tool, remove useless options (-t, basic_simulator, rf_simulator) as corresponding libraries always built