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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
71bd10b4
Commit
71bd10b4
authored
Oct 02, 2024
by
Robert Schmidt
Committed by
Laurent THOMAS
Oct 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
docker-compose: write correct container image to use for 4G and asan
parent
cb7942d4
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
18 deletions
+20
-18
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+3
-1
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+3
-3
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
...ml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
...ripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+2
-2
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+2
-2
No files found.
ci-scripts/cls_containerize.py
View file @
71bd10b4
...
...
@@ -214,7 +214,9 @@ def WriteEnvFile(ssh, services, wd, tag):
ret
=
ssh
.
run
(
f'docker image inspect
{
checkimg
}
'
,
reportNonZero
=
False
)
if
ret
.
returncode
==
0
:
logging
.
info
(
f"detected pulled image
{
checkimg
}
"
)
if
"oai-gnb"
in
image
:
envs
[
"GNB_IMG"
]
=
"oai-gnb-asan"
if
"oai-enb"
in
image
:
envs
[
"ENB_IMG"
]
=
"oai-enb-asan"
elif
"oai-gnb"
in
image
:
envs
[
"GNB_IMG"
]
=
"oai-gnb-asan"
elif
"oai-lte-ue"
in
image
:
envs
[
"LTEUE_IMG"
]
=
"oai-lte-ue-asan"
elif
"oai-nr-ue"
in
image
:
envs
[
"NRUE_IMG"
]
=
"oai-nr-ue-asan"
elif
"oai-nr-cuup"
in
image
:
envs
[
"NRCUUP_IMG"
]
=
"oai-nr-cuup-asan"
else
:
logging
.
warning
(
"undetected image format {image}, cannot use asan"
)
...
...
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
View file @
71bd10b4
...
...
@@ -178,7 +178,7 @@ services:
retries
:
5
oai_enb
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
l2sim4g-oai-enb
network_mode
:
"
host"
...
...
@@ -210,7 +210,7 @@ services:
retries
:
5
oai_ue1
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
l2sim4g-oai-lte-ue1
network_mode
:
"
host"
...
...
@@ -229,7 +229,7 @@ services:
retries
:
5
oai_ue2
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
l2sim4g-oai-lte-ue2
network_mode
:
"
host"
...
...
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
View file @
71bd10b4
...
...
@@ -178,7 +178,7 @@ services:
retries
:
5
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -196,7 +196,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
View file @
71bd10b4
services
:
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -18,7 +18,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
View file @
71bd10b4
...
...
@@ -178,7 +178,7 @@ services:
retries
:
5
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -196,7 +196,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
View file @
71bd10b4
...
...
@@ -178,7 +178,7 @@ services:
retries
:
5
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -196,7 +196,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
View file @
71bd10b4
services
:
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -18,7 +18,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
View file @
71bd10b4
services
:
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -18,7 +18,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
View file @
71bd10b4
...
...
@@ -178,7 +178,7 @@ services:
retries
:
5
oai_enb0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-enb
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${ENB_IMG:-oai-enb}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-enb
networks
:
...
...
@@ -196,7 +196,7 @@ services:
retries
:
5
oai_ue0
:
image
:
${REGISTRY:-oaisoftwarealliance}/
oai-lte-ue
:${TAG:-develop}
image
:
${REGISTRY:-oaisoftwarealliance}/
${LTEUE_IMG:-oai-lte-ue}
:${TAG:-develop}
privileged
:
true
container_name
:
rfsim4g-oai-lte-ue0
networks
:
...
...
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