From c8b9cf6c63b6039e32d4eb1c882d30bb9b63a051 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 24 Jan 2023 14:49:28 +0100
Subject: [PATCH 1/3] fix(ci): no more devtoolset on caracal

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 ci-scripts/xml_files/gnb_usrp_build.xml | 2 +-
 cmake_targets/tools/build_helper        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci-scripts/xml_files/gnb_usrp_build.xml b/ci-scripts/xml_files/gnb_usrp_build.xml
index a2b14f740c..3fc1b1c955 100644
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -34,7 +34,7 @@
 		<mode>TesteNB</mode>	
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
-		<Build_eNB_args>--gNB -w USRP --ninja --cmake-opt -DBoost_INCLUDE_DIR=/usr/include/boost169 --cmake-opt -DCUDA_HOST_COMPILER=/opt/rh/devtoolset-7/root/usr/bin/gcc -c -P</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja -c -P</Build_eNB_args>
 		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index ed02847387..a16e854142 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -122,6 +122,7 @@ check_supported_distribution() {
         "rhel8.6")     return 0 ;;
         "rhel8.7")     return 0 ;;
         "rhel9.0")     return 0 ;;
+        "rhel9.1")     return 0 ;;
         "centos7")     return 0 ;;
         "centos8")     return 0 ;;
     esac

From 3beb38d3c1b6accdb38ffd2f334e64f741c42bd4 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Fri, 27 Jan 2023 10:16:49 +0100
Subject: [PATCH 2/3] fix(ci): network interface name has changed

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 ci-scripts/xml_files/gnb_phytest_usrp_run.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index 7a9eafeb8f..707ec61711 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -37,7 +37,7 @@
     <rt_stats_cfg>datalog_rt_stats.default.yaml</rt_stats_cfg>
 		<air_interface>NR</air_interface>
 		<USRP_IPAddress>192.168.20.2</USRP_IPAddress>
-		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0 --membind=netdev:enp94s0f0</cmd_prefix>
+		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">

From b167298cb0b86f0361406258da199eccd55baaed Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 31 Jan 2023 09:29:01 +0100
Subject: [PATCH 3/3] testing webhook

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 cmake_targets/tools/build_helper | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index a16e854142..029d25b236 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -123,6 +123,8 @@ check_supported_distribution() {
         "rhel8.7")     return 0 ;;
         "rhel9.0")     return 0 ;;
         "rhel9.1")     return 0 ;;
+        "rhel9.2")     return 0 ;;
+        "rhel9.3")     return 0 ;;
         "centos7")     return 0 ;;
         "centos8")     return 0 ;;
     esac