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
abd5b2cf
Commit
abd5b2cf
authored
Aug 29, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/update_5gcn_aug2022' into integration_2022_wk35
parents
845eeae9
313a63f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
ci-scripts/epc.py
ci-scripts/epc.py
+2
-2
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+4
-4
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+4
-4
No files found.
ci-scripts/epc.py
View file @
abd5b2cf
...
...
@@ -253,7 +253,7 @@ class EPCManagement():
logging
.
debug
(
'Starting OAI CN5G'
)
mySSH
.
command
(
'if [ -d '
+
self
.
SourceCodePath
+
'/scripts ]; then echo '
+
self
.
Password
+
' | sudo -S rm -Rf '
+
self
.
SourceCodePath
+
'/scripts ; fi'
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p '
+
self
.
SourceCodePath
+
'/scripts'
,
'\$'
,
5
)
mySSH
.
command
(
'cd /opt/oai-cn5g-fed-v1.
3
/docker-compose'
,
'\$'
,
5
)
mySSH
.
command
(
'cd /opt/oai-cn5g-fed-v1.
4
/docker-compose'
,
'\$'
,
5
)
mySSH
.
command
(
'python3 ./core-network.py '
+
self
.
cfgDeploy
,
'\$'
,
60
)
if
re
.
search
(
'start-mini-as-ue'
,
self
.
cfgDeploy
):
dFile
=
'docker-compose-mini-nrf-asue.yaml'
...
...
@@ -537,7 +537,7 @@ class EPCManagement():
mySSH
.
command
(
'docker logs '
+
c
+
' > '
+
self
.
SourceCodePath
+
'/logs/'
+
c
+
'.log'
,
'\$'
,
5
)
logging
.
debug
(
'Terminating OAI CN5G'
)
mySSH
.
command
(
'cd /opt/oai-cn5g-fed-v1.
3
/docker-compose'
,
'\$'
,
5
)
mySSH
.
command
(
'cd /opt/oai-cn5g-fed-v1.
4
/docker-compose'
,
'\$'
,
5
)
mySSH
.
command
(
'python3 ./core-network.py '
+
self
.
cfgUnDeploy
,
'\$'
,
60
)
mySSH
.
command
(
'docker volume prune --force || true'
,
'\$'
,
60
)
time
.
sleep
(
2
)
...
...
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
View file @
abd5b2cf
...
...
@@ -2,7 +2,7 @@ version: '3.8'
services
:
oai-nrf
:
container_name
:
"
l2sim-oai-nrf"
image
:
oai-nrf:
latest
image
:
oai-nrf:
august-dev
environment
:
-
NRF_INTERFACE_NAME_FOR_SBI=eth0
-
NRF_INTERFACE_PORT_FOR_SBI=80
...
...
@@ -42,7 +42,7 @@ services:
ipv4_address
:
192.168.71.131
oai-amf
:
container_name
:
"
l2sim-oai-amf"
image
:
oai-amf:
latest
image
:
oai-amf:
august-dev
environment
:
-
TZ=Europe/paris
-
INSTANCE=0
...
...
@@ -110,7 +110,7 @@ services:
ipv4_address
:
192.168.71.132
oai-smf
:
container_name
:
"
l2sim-oai-smf"
image
:
oai-smf:
latest
image
:
oai-smf:
august-dev
environment
:
-
TZ=Europe/Paris
-
INSTANCE=0
...
...
@@ -156,7 +156,7 @@ services:
ipv4_address
:
192.168.71.133
oai-spgwu
:
container_name
:
"
l2sim-oai-spgwu"
image
:
oai-spgwu-tiny:
latest
image
:
oai-spgwu-tiny:
august-dev
environment
:
-
TZ=Europe/Paris
-
PID_DIRECTORY=/var/run
...
...
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
View file @
abd5b2cf
...
...
@@ -2,7 +2,7 @@ version: '3.8'
services
:
oai-nrf
:
container_name
:
"
rfsim5g-oai-nrf"
image
:
oai-nrf:
latest
image
:
oai-nrf:
august-dev
environment
:
-
NRF_INTERFACE_NAME_FOR_SBI=eth0
-
NRF_INTERFACE_PORT_FOR_SBI=80
...
...
@@ -42,7 +42,7 @@ services:
ipv4_address
:
192.168.71.131
oai-amf
:
container_name
:
"
rfsim5g-oai-amf"
image
:
oai-amf:
latest
image
:
oai-amf:
august-dev
environment
:
-
TZ=Europe/paris
-
INSTANCE=0
...
...
@@ -110,7 +110,7 @@ services:
ipv4_address
:
192.168.71.132
oai-smf
:
container_name
:
"
rfsim5g-oai-smf"
image
:
oai-smf:
latest
image
:
oai-smf:
august-dev
environment
:
-
TZ=Europe/Paris
-
INSTANCE=0
...
...
@@ -156,7 +156,7 @@ services:
ipv4_address
:
192.168.71.133
oai-spgwu
:
container_name
:
"
rfsim5g-oai-spgwu"
image
:
oai-spgwu-tiny:
latest
image
:
oai-spgwu-tiny:
august-dev
environment
:
-
TZ=Europe/Paris
-
PID_DIRECTORY=/var/run
...
...
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