Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
54965235
Commit
54965235
authored
Mar 05, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/ci-maintenance-fixes' into integration_2024_w09
parents
331fb1ce
e9f0541a
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
128 additions
and
91 deletions
+128
-91
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+13
-9
ci-scripts/xml_files/container_5g_e1_rfsim.xml
ci-scripts/xml_files/container_5g_e1_rfsim.xml
+7
-0
ci-scripts/xml_files/container_5g_f1_rfsim.xml
ci-scripts/xml_files/container_5g_f1_rfsim.xml
+7
-0
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+7
-18
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+7
-18
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+7
-18
ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+6
-8
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+1
-1
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+1
-1
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+7
-18
ci-scripts/xml_files/container_nsa_b200_terminate.xml
ci-scripts/xml_files/container_nsa_b200_terminate.xml
+13
-0
ci-scripts/xml_files/container_sa_b200_terminate.xml
ci-scripts/xml_files/container_sa_b200_terminate.xml
+13
-0
ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
+13
-0
ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
+13
-0
ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
+13
-0
No files found.
ci-scripts/cls_containerize.py
View file @
54965235
...
...
@@ -662,22 +662,26 @@ class Containerize():
collectInfo
[
'proxy'
]
=
files
mySSH
.
command
(
'docker image inspect --format=
\'
Size = {{.Size}} bytes
\'
proxy:'
+
tag
,
'\$'
,
5
)
result
=
re
.
search
(
'Size *= *(?P<size>[0-9\-]+) *bytes'
,
mySSH
.
getBefore
())
# Cleaning any created tmp volume
mySSH
.
command
(
self
.
cli
+
' volume prune --force || true'
,
'\$'
,
15
)
mySSH
.
close
()
allImagesSize
=
{}
if
result
is
not
None
:
imageSize
=
float
(
result
.
group
(
'size'
))
/
1000000
logging
.
debug
(
'
\u001B
[1m proxy size is '
+
(
'%.0f'
%
imageSize
)
+
' Mbytes
\u001B
[0m'
)
allImagesSize
[
'proxy'
]
=
str
(
round
(
imageSize
,
1
))
+
' Mbytes'
logging
.
info
(
'
\u001B
[1m Building L2sim Proxy Image Pass
\u001B
[0m'
)
HTML
.
CreateHtmlTestRow
(
'commit '
+
tag
,
'OK'
,
CONST
.
ALL_PROCESSES_OK
)
HTML
.
CreateHtmlNextTabHeaderTestRow
(
collectInfo
,
allImagesSize
)
return
True
else
:
logging
.
debug
(
'proxy size is unknown'
)
logging
.
error
(
'proxy size is unknown'
)
allImagesSize
[
'proxy'
]
=
'unknown'
# Cleaning any created tmp volume
mySSH
.
command
(
self
.
cli
+
' volume prune --force || true'
,
'\$'
,
15
)
mySSH
.
close
()
logging
.
info
(
'
\u001B
[1m Building L2sim Proxy Image Pass
\u001B
[0m'
)
HTML
.
CreateHtmlTestRow
(
'commit '
+
tag
,
'OK'
,
CONST
.
ALL_PROCESSES_OK
)
HTML
.
CreateHtmlNextTabHeaderTestRow
(
collectInfo
,
allImagesSize
)
logging
.
error
(
'
\u001B
[1m Build of L2sim proxy failed
\u001B
[0m'
)
HTML
.
CreateHtmlTestRow
(
'commit '
+
tag
,
'KO'
,
CONST
.
ALL_PROCESSES_OK
)
HTML
.
CreateHtmlTabFooter
(
False
)
return
False
def
BuildRunTests
(
self
,
HTML
):
if
self
.
ranRepository
==
''
or
self
.
ranBranch
==
''
or
self
.
ranCommitID
==
''
:
...
...
ci-scripts/xml_files/container_5g_e1_rfsim.xml
View file @
54965235
...
...
@@ -30,6 +30,7 @@
000021
000022
000023
000024
020021
100021
</TestCaseRequestedList>
...
...
@@ -66,6 +67,12 @@
<nb_healthy>
14
</nb_healthy>
</testCase>
<testCase
id=
"000024"
>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3
</id>
</testCase>
<testCase
id=
"020021"
>
<class>
Ping
</class>
<desc>
Ping ext-dn from all NR-UEs
</desc>
...
...
ci-scripts/xml_files/container_5g_f1_rfsim.xml
View file @
54965235
...
...
@@ -29,6 +29,7 @@
100021
000021
000022
000023
020021
030021
030022
...
...
@@ -59,6 +60,12 @@
<nb_healthy>
8
</nb_healthy>
</testCase>
<testCase
id=
"000023"
>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020021"
>
<class>
Ping
</class>
<desc>
Ping ext-dn from all NR-UEs
</desc>
...
...
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
View file @
54965235
...
...
@@ -28,7 +28,6 @@
<TestCaseRequestedList>
111111
100011
000010
000011
000012
000013
...
...
@@ -47,36 +46,26 @@
<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>
<services>
oai-gnb
oai-nr-ue
</services>
<nb_healthy>
7
</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>
<nb_healthy>
7
</nb_healthy>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020011"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
View file @
54965235
...
...
@@ -28,7 +28,6 @@
<TestCaseRequestedList>
111111
100001
000000
000001
000002
000003
...
...
@@ -47,36 +46,26 @@
<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 RF
sim SA
</desc>
<yaml_path>
yaml_files/5g_rfsimulator_24prb
</yaml_path>
<services>
oai-gnb
</services>
<nb_healthy>
6
</nb_healthy>
<services>
oai-gnb
oai-nr-ue
</services>
<nb_healthy>
7
</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>
<nb_healthy>
7
</nb_healthy>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020001"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
View file @
54965235
...
...
@@ -28,7 +28,6 @@
<TestCaseRequestedList>
111111
100001
000000
000001
000002
000003
...
...
@@ -47,36 +46,26 @@
<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>
<services>
oai-gnb
oai-nr-ue
</services>
<nb_healthy>
7
</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>
<nb_healthy>
7
</nb_healthy>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020001"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
View file @
54965235
...
...
@@ -43,18 +43,16 @@
<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>
<services>
oai-du
oai-nr-ue
</services>
<nb_healthy>
2
</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>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020021"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
View file @
54965235
...
...
@@ -50,7 +50,7 @@
<class>
Custom_Command
</class>
<desc>
Clean-Up any residual volume
</desc>
<node>
localhost
</node>
<command>
docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config
</command>
<command>
docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config
-f
</command>
</testCase>
<testCase
id=
"000010"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
View file @
54965235
...
...
@@ -48,7 +48,7 @@
<class>
Custom_Command
</class>
<desc>
Clean-Up any residual volume
</desc>
<node>
localhost
</node>
<command>
docker volume rm 5g_rfsimulator_tdd_dora_rrc.config
</command>
<command>
docker volume rm 5g_rfsimulator_tdd_dora_rrc.config
-f
</command>
</testCase>
<testCase
id=
"000000"
>
...
...
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
View file @
54965235
...
...
@@ -28,7 +28,6 @@
<TestCaseRequestedList>
111111
100001
000000
000001
000002
000003
...
...
@@ -47,36 +46,26 @@
<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>
<services>
oai-gnb
oai-nr-ue
</services>
<nb_healthy>
7
</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>
<nb_healthy>
7
</nb_healthy>
<class>
Attach_UE
</class>
<desc>
Attach OAI UE (Wait for IP)
</desc>
<id>
rfsim5g_ue
</id>
</testCase>
<testCase
id=
"020001"
>
...
...
ci-scripts/xml_files/container_nsa_b200_terminate.xml
View file @
54965235
...
...
@@ -26,6 +26,8 @@
<htmlTabIcon>
tasks
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
010001
010002
030202
030201
222220
...
...
@@ -33,6 +35,17 @@
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase
id=
"010001"
>
<class>
Detach_UE
</class>
<desc>
Detach UE
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"010002"
>
<class>
Terminate_UE
</class>
<desc>
Terminate Quectel
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"030201"
>
<class>
Undeploy_Object
</class>
<desc>
Undeploy eNB
</desc>
...
...
ci-scripts/xml_files/container_sa_b200_terminate.xml
View file @
54965235
...
...
@@ -26,10 +26,23 @@
<htmlTabIcon>
tasks
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
010001
010002
030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase
id=
"010001"
>
<class>
Detach_UE
</class>
<desc>
Detach UE
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"010002"
>
<class>
Terminate_UE
</class>
<desc>
Terminate Quectel
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"030201"
>
<class>
Undeploy_Object
</class>
<desc>
Undeploy gNB
</desc>
...
...
ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
View file @
54965235
...
...
@@ -26,11 +26,24 @@
<htmlTabIcon>
tasks
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
010001
010002
330201
222222
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase
id=
"010001"
>
<class>
Detach_UE
</class>
<desc>
Detach UE
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"010002"
>
<class>
Terminate_UE
</class>
<desc>
Terminate Quectel
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"330201"
>
<class>
Undeploy_Object
</class>
<desc>
Undeploy CU-CP/CU-UP/DU
</desc>
...
...
ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
View file @
54965235
...
...
@@ -26,10 +26,23 @@
<htmlTabIcon>
tasks
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
010001
010002
230201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase
id=
"010001"
>
<class>
Detach_UE
</class>
<desc>
Detach UE
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"010002"
>
<class>
Terminate_UE
</class>
<desc>
Terminate Quectel
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"230201"
>
<class>
Undeploy_Object
</class>
<desc>
Undeploy CU-DU
</desc>
...
...
ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
View file @
54965235
...
...
@@ -26,10 +26,23 @@
<htmlTabIcon>
tasks
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
010001
010002
030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase
id=
"010001"
>
<class>
Detach_UE
</class>
<desc>
Detach UE
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"010002"
>
<class>
Terminate_UE
</class>
<desc>
Terminate Quectel
</desc>
<id>
idefix
</id>
</testCase>
<testCase
id=
"030201"
>
<class>
Undeploy_Object
</class>
<desc>
Undeploy gNB
</desc>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment