minor modifications for rhel7.7 build

Merge remote-tracking branch 'origin/develop' into rhel77-build
CI: putting back flexran-ctl in build/testing --> now on develop branch of this repo
2026-07-15 13:40:29 +00:00 · 2020-01-10 18:14:47 +01:00 · 2020-01-10 18:14:38 +01:00 · 2019-11-29 13:58:31 +01:00 · 2019-11-08 08:07:30 +01:00 · 2019-11-07 23:10:17 +01:00
3 changed files with 8 additions and 7 deletions
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -3789,13 +3789,13 @@ class SSHConnection():
 				eNB_cnt = self.x2NbENBs
 				cnt = 0
 				while cnt < eNB_cnt:
-					cmd = "curl -XPOST http://" + self.EPCIPAddress + ":9999/rrc/x2_ho_net_control/enb/" + str(self.x2ENBBsIds[0][cnt]) + "/1"
+					cmd = "curl --silent -XPOST http://" + self.EPCIPAddress + ":9999/rrc/x2_ho_net_control/enb/" + str(self.x2ENBBsIds[0][cnt]) + "/1"
 					logging.debug(cmd)
 					fullMessage += cmd + '\n'
 					subprocess.run(cmd, shell=True)
 					cnt += 1
 				# Waiting for the activation to be active
-				time.sleep(10)
+				time.sleep(20)
 				msg = "Switching UE(s) from eNB to eNB"
 				logging.debug(msg)
 				fullMessage += msg + '\n'
@@ -3803,13 +3803,13 @@ class SSHConnection():
 				while cnt < eNB_cnt:
 					ueIdx = 0
 					while ueIdx < len(self.x2ENBConnectedUEs[0][cnt]):
-						cmd = "curl -XPOST http://" + self.EPCIPAddress + ":9999/rrc/ho/senb/" + str(self.x2ENBBsIds[0][cnt]) + "/ue/" + str(self.x2ENBConnectedUEs[0][cnt][ueIdx]) + "/tenb/" + str(self.x2ENBBsIds[0][eNB_cnt - cnt - 1])
+						cmd = "curl --silent -XPOST http://" + self.EPCIPAddress + ":9999/rrc/ho/senb/" + str(self.x2ENBBsIds[0][cnt]) + "/ue/" + str(self.x2ENBConnectedUEs[0][cnt][ueIdx]) + "/tenb/" + str(self.x2ENBBsIds[0][eNB_cnt - cnt - 1])
 						logging.debug(cmd)
 						fullMessage += cmd + '\n'
 						subprocess.run(cmd, shell=True)
 						ueIdx += 1
 					cnt += 1
-				time.sleep(10)
+				time.sleep(20)
 				# check
 				logging.debug("Checking the Status after X2 Handover")
 				fullMessage += self.X2_Status(1, self.testCase_id + '_post_ho.json') 
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml
@@ -25,7 +25,7 @@
 	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
 	<htmlTabName>Test-X2-HO-FDD-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
 030201 030202
 040101
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -103,6 +103,7 @@ check_supported_distribution() {
        "fedora24")    return 0 ;;
        "rhel7")       return 0 ;;
 	"rhel7.6")     return 0 ;;
+	"rhel7.7")     return 0 ;;
        "centos7")     return 0 ;;
    esac
    return 1
@@ -319,13 +320,13 @@ install_usrp_uhd_driver() {
    # quick workaround for RHE7.6
    local distribution=$(get_distribution_release)
    if [ -z $1 ]; then
-      if [[ "$distribution" == "rhel7.6" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]]; then
          $SUDO /usr/local/bin/uhd_images_downloader
      else
          $SUDO uhd_images_downloader
      fi
    else
-      if [[ "$distribution" == "rhel7.6" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]]; then
          $SUDO /usr/local/bin/uhd_images_downloader -i $1
      else
          $SUDO uhd_images_downloader -i $1
Author	SHA1	Message	Date
Raymond Knopp	8878d344da	minor modifications for rhel7.7 build	2020-01-10 18:14:47 +01:00
Raymond Knopp	1d3726e416	Merge remote-tracking branch 'origin/develop' into rhel77-build	2020-01-10 18:14:38 +01:00
Raphael Defosseux	a40f9d9d23	CI: putting back flexran-ctl in build/testing --> now on develop branch of this repo Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-11-29 13:58:31 +01:00
Raphael Defosseux	99a003b7fc	Merge branch 'hotfix_cqi_scheduling' into 'master' Hotfix: CQI scheduling in TDD See merge request oai/openairinterface5g!711	2019-11-08 08:07:30 +01:00
Raphael Defosseux	7f19d11424	CI: tuning on TDD scenarios Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-11-07 23:10:17 +01:00
Raphael Defosseux	0caec0acb7	CI: preparing release notes for patch --> also adding TDD monolithic test at 20MHz with default scheduler --> putting IF4.p5 TDD scenarios with default scheduler Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-11-07 18:58:18 +01:00
masayuki.harada	d2346bdff0	Fix scheduling PUSCH when CQI has not been received for a long time in fairRR scheduler.	2019-11-07 21:57:57 +09:00
masayuki.harada	85c160ddc0	Fix cqi_req clear timing, and schedule PUSCH when CQI has not been received for a long time in fairRR scheduler.	2019-11-07 16:54:08 +09:00
Cedric Roux	e2305bff66	hotfix: better CQI requests, especially for TDD In TDD mode, CQI requests are not possible in special subframes (at least for some TDD configurations, see 36.213 7.2.3 that says "a DL subframe is valid if it does not contain a DwPTS field if the length is less than 7680 Ts"). In the code, we simply disable CQI requests in special subframes, no matter what the length of DwPTS. A problem can arise if the DCI0 for a given UE are sent only in those special subframes. In this case the UE will never report CQI and the eNB will use low MCS for this UE, impacting performances. Another, related, problem is when there are several UEs. There again one UE might always get its DCI0 in special subframes and thus never report CQI. There again, performance issues. This commit is an attempt to improve the situation. It does two things. 1 - tag the UE as schedulable in the function UE_is_to_be_scheduled if the cqi_req_timer is expired 2 - use cqi_req_timer as a criterium when ordering UEs for UL scheduling The value chosen for the expiration of the cqi_req_timer in UE_is_to_be_scheduled is quite high (300) because as the code is today we may overschedule the UE for short bursts until we receive a CQI from the UE. [TODO: fix the code properly to avoid this behavior.] Note: the fairRR scheduler has not been analyzed and this commit may not fix anything in case the fairRR scheduler is used.	2019-11-07 12:19:09 +09:00
Raphael Defosseux	7af841272f	Merge branch 'release_v1_1_0_candidate' into 'master' Release v1.1.0 Candidate See merge request oai/openairinterface5g!650	2019-07-25 21:04:14 +02:00
Raphael Defosseux	4c19d961d7	CI: trying to stablize the X2 Handover testing Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-07-25 13:58:09 +02:00
Raphael Defosseux	b958b57db2	Merge remote-tracking branch 'origin/develop' into release_v1_1_0_candidate	2019-07-25 13:50:27 +02:00
Raphael Defosseux	69e4901e42	Merge branch 'limesuite_v19.04.0_compatibility' into 'master' Update lms_lib.cpp to LimeSuite v19.04.0 API See merge request oai/openairinterface5g!604	2019-06-07 14:45:18 +02:00
Raphael Defosseux	1cdeed6c1d	Updating the release notes Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-06-07 10:08:19 +02:00
jordan moore	86ba488ea7	Update lms_lib.cpp	2019-06-07 05:35:58 +02:00
Raphael Defosseux	6cf4d59d2c	Merge branch 'hot-fix-test-boris' into 'master' Integration into the Master Jenkins pipeline of L1 simulator testing See merge request oai/openairinterface5g!528	2019-03-05 13:14:13 +01:00
Boris Djalal	07758a5f75	CI: dummy commit Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 16:17:30 +01:00
Raphael Defosseux	bf9f88572a	CI: the slave job should have the correct target branch when running on MR Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-03-04 15:47:21 +01:00
Boris Djalal	d74942eec3	CI: adding L1-noS1 simulator to Jenkins pipeline. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 14:07:30 +01:00
Boris Djalal	0995a99170	Add HTML report for noS1 test. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	c02cb8ef67	Update status of test. Iperf tests no more taken into account. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	0295caa98a	Iperf DL seems to be working. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	d6dd4c25a9	Add pinging the UE from the eNB. Successful tests: eNB sync, UE sync, pinging the eNB from the UE and the UE from the eNB. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	0bc4e28260	save before merge with master Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	ee35014050	Add configuration files. Ping the UE from the eNB. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	367f890515	Fixes file permission problem by adding sudo. Removes debug printings. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Boris Djalal	7f4f6688a8	First commit. Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>	2019-03-04 13:58:34 +01:00
Raphael Defosseux	0d19170282	CI: comment message is now in all HTML reports Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-03-01 16:49:57 +01:00
Raphael Defosseux	cc62375d22	CI: VM-based tests are now sequential to prevent too much stress even in sequential mode, all VM-based are run. Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>	2019-03-01 16:47:31 +01:00
Raphael Defosseux	1c495cfdcb	Merge branch 'uhd_3131_fix' into 'master' See merge request oai/openairinterface5g!515 Changes to make oai work with UHD 3.13.1 and later.	2019-02-22 17:51:55 +01:00