Skip to content

O
OpenXG-RAN
Commit e845a9c3 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

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.
parent c99db698
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 95 deletions
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
View file @ e845a9c3
...@@ -28,10 +28,8 @@ ...@@ -28,10 +28,8 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
100011 100011
000010
000011 000011
000012 000012
000013
020011 020011
020012 020012
030011 030011
...@@ -47,35 +45,19 @@ ...@@ -47,35 +45,19 @@
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull> <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
</testCase> </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"> <testCase id="000011">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CoreNetwork</desc> <desc>Deploy OAI 5G CoreNetwork</desc>
<yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path> <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> <nb_healthy>5</nb_healthy>
</testCase> </testCase>
<testCase id="000012"> <testCase id="000012">
<class>DeployGenObject</class> <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> <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> <nb_healthy>7</nb_healthy>
</testCase> </testCase>
......
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
View file @ e845a9c3
...@@ -28,10 +28,8 @@ ...@@ -28,10 +28,8 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
100001 100001
000000
000001 000001
000002 000002
000003
020001 020001
020002 020002
030001 030001
...@@ -47,35 +45,19 @@ ...@@ -47,35 +45,19 @@
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull> <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
</testCase> </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"> <testCase id="000001">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CoreNetwork</desc> <desc>Deploy OAI 5G CoreNetwork</desc>
<yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path> <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> <nb_healthy>5</nb_healthy>
</testCase> </testCase>
<testCase id="000002"> <testCase id="000002">
<class>DeployGenObject</class> <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> <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> <nb_healthy>7</nb_healthy>
</testCase> </testCase>
......
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
View file @ e845a9c3
...@@ -28,10 +28,8 @@ ...@@ -28,10 +28,8 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
100001 100001
000000
000001 000001
000002 000002
000003
020001 020001
020002 020002
030001 030001
...@@ -47,35 +45,19 @@ ...@@ -47,35 +45,19 @@
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull> <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
</testCase> </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"> <testCase id="000001">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CoreNetwork</desc> <desc>Deploy OAI 5G CoreNetwork</desc>
<yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path> <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> <nb_healthy>5</nb_healthy>
</testCase> </testCase>
<testCase id="000002"> <testCase id="000002">
<class>DeployGenObject</class> <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> <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> <nb_healthy>7</nb_healthy>
</testCase> </testCase>
......
ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
View file @ e845a9c3
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
000020 000020
000021
020021 020021
100021 100021
100022 100022
...@@ -43,17 +42,9 @@ ...@@ -43,17 +42,9 @@
<testCase id="000020"> <testCase id="000020">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI-DU</desc> <desc>Deploy OAI-DU+nrUE</desc>
<yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path> <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
<services>oai-du</services> <services>oai-du oai-nr-ue</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>
<nb_healthy>2</nb_healthy> <nb_healthy>2</nb_healthy>
</testCase> </testCase>
......
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
View file @ e845a9c3
...@@ -28,10 +28,8 @@ ...@@ -28,10 +28,8 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
100001 100001
000000
000001 000001
000002 000002
000003
020001 020001
020002 020002
030001 030001
...@@ -47,35 +45,19 @@ ...@@ -47,35 +45,19 @@
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull> <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
</testCase> </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"> <testCase id="000001">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CoreNetwork</desc> <desc>Deploy OAI 5G CoreNetwork</desc>
<yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path> <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> <nb_healthy>5</nb_healthy>
</testCase> </testCase>
<testCase id="000002"> <testCase id="000002">
<class>DeployGenObject</class> <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> <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> <nb_healthy>7</nb_healthy>
</testCase> </testCase>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment