From e845a9c3b7e6210237b20c28acc191418157fb5e Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 29 Feb 2024 18:56:31 +0100
Subject: [PATCH] CI: Make RFsim start-up faster

Make RFsim start up faster by starting core and RAN start at the same
time. This speeds up because we do not wait for "healthy" containers
serially, but parallely.

For the RAN, it is safe to start gNB and UE at the same time in SA mode
(as the UE will only attach once the radio, and hence the full gNB, is
ready).

We do not start in parallel in do-ra and phytest, as in these modes the
gNB first has to write a UE-specific configuration file. If we start
both gNB and UE at the same time, the UE might try to read the file
before it is written, leading to a failure.
---
 .../xml_files/container_5g_fdd_rfsim.xml      | 24 +++----------------
 .../xml_files/container_5g_rfsim_24prb.xml    | 24 +++----------------
 .../xml_files/container_5g_rfsim_2x2.xml      | 24 +++----------------
 .../container_5g_rfsim_f1_accelleran.xml      | 13 ++--------
 .../xml_files/container_5g_rfsim_u0_25prb.xml | 24 +++----------------
 5 files changed, 14 insertions(+), 95 deletions(-)

diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
index cfcf40e69e..463cb3f2e8 100644
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -28,10 +28,8 @@
         <TestCaseRequestedList>
  111111
  100011
- 000010
  000011
  000012
- 000013
  020011
  020012
  030011
@@ -47,35 +45,19 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
-        <testCase id="000010">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
         <testCase id="000011">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000012">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
-        </testCase>
-
-        <testCase id="000013">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-nr-ue</services>
+                <services>oai-gnb oai-nr-ue</services>
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
index 41f25476c3..4f838658ec 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -28,10 +28,8 @@
         <TestCaseRequestedList>
  111111
  100001
- 000000
  000001
  000002
- 000003
  020001
  020002
  030001
@@ -47,35 +45,19 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
-        </testCase>
-
-        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-nr-ue</services>
+                <services>oai-gnb oai-nr-ue</services>
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
index defe15a1df..45c311fd97 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -28,10 +28,8 @@
         <TestCaseRequestedList>
  111111
  100001
- 000000
  000001
  000002
- 000003
  020001
  020002
  030001
@@ -47,35 +45,19 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
-        </testCase>
-
-        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-nr-ue</services>
+                <services>oai-gnb oai-nr-ue</services>
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
index d1433db738..5baa950549 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -27,7 +27,6 @@
         <TestCaseRequestedList>
  111111
  000020
- 000021
  020021
  100021
  100022
@@ -43,17 +42,9 @@
 
         <testCase id="000020">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI-DU</desc>
+                <desc>Deploy OAI-DU+nrUE</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-du</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
-        <testCase id="000021">
-                <class>DeployGenObject</class>
-                <desc>Deploy nrUE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-nr-ue</services>
+                <services>oai-du oai-nr-ue</services>
                 <nb_healthy>2</nb_healthy>
         </testCase>
 
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
index f059d69614..c31d6c1843 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -28,10 +28,8 @@
         <TestCaseRequestedList>
  111111
  100001
- 000000
  000001
  000002
- 000003
  020001
  020002
  030001
@@ -47,35 +45,19 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
-        </testCase>
-
-        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-nr-ue</services>
+                <services>oai-gnb oai-nr-ue</services>
                 <nb_healthy>7</nb_healthy>
         </testCase>