maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(ci): applying the same image syntax with oaisoftwarealliance/ for RAN components

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2023-02-03 14:03:53 +01:00
parent 76ed14e76c
commit 6905159a38
22 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+9 -6
View File
@@ -289,6 +289,7 @@ class Containerize():
self.deployedContainers = [] self.deployedContainers = []
self.tsharkStarted = False self.tsharkStarted = False
self.displayedNewTags = False
self.pingContName = '' self.pingContName = ''
self.pingOptions = '' self.pingOptions = ''
self.pingLossThreshold = '' self.pingLossThreshold = ''
@@ -1062,12 +1063,13 @@ class Containerize():
return return
cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml' cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml'
self.run_cmd_local_host(cmd) self.run_cmd_local_host(cmd, silent=self.displayedNewTags)
imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru'] imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
for image in imageNames: for image in imageNames:
tagToUse = self.ImageTagToUse(image) tagToUse = self.ImageTagToUse(image)
cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
self.run_cmd_local_host(cmd) self.run_cmd_local_host(cmd, silent=self.displayedNewTags)
silent=self.displayedNewTags = True
cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml up -d ' + self.services[0] cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml up -d ' + self.services[0]
try: try:
@@ -1197,12 +1199,13 @@ class Containerize():
logPath = '../cmake_targets/log/' + ymlPath[1] logPath = '../cmake_targets/log/' + ymlPath[1]
cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml' cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml'
self.run_cmd_local_host(cmd) self.run_cmd_local_host(cmd, silent=self.displayedNewTags)
imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru'] imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
for image in imageNames: for image in imageNames:
tagToUse = self.ImageTagToUse(image) tagToUse = self.ImageTagToUse(image)
cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
self.run_cmd_local_host(cmd) self.run_cmd_local_host(cmd, silent=self.displayedNewTags)
silent=self.displayedNewTags = True
# check which containers are running for log recovery later # check which containers are running for log recovery later
cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all' cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+3 -3
View File
@@ -180,7 +180,7 @@ services:
retries: 5 retries: 5
oai_enb: oai_enb:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: l2sim4g-oai-enb container_name: l2sim4g-oai-enb
network_mode: "host" network_mode: "host"
@@ -230,7 +230,7 @@ services:
retries: 5 retries: 5
oai_ue1: oai_ue1:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: l2sim4g-oai-lte-ue1 container_name: l2sim4g-oai-lte-ue1
network_mode: "host" network_mode: "host"
@@ -258,7 +258,7 @@ services:
retries: 5 retries: 5
oai_ue2: oai_ue2:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: l2sim4g-oai-lte-ue2 container_name: l2sim4g-oai-lte-ue2
network_mode: "host" network_mode: "host"
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
-3
View File
@@ -54,9 +54,6 @@ $ docker image tag oaisoftwarealliance/oai-spgwc:latest oai-spgwc:latest
$ docker image tag oaisoftwarealliance/oai-hss:latest oai-hss:latest $ docker image tag oaisoftwarealliance/oai-hss:latest oai-hss:latest
$ docker image tag oaisoftwarealliance/oai-spgwu-tiny:latest oai-spgwu-tiny:latest $ docker image tag oaisoftwarealliance/oai-spgwu-tiny:latest oai-spgwu-tiny:latest
$ docker image tag oaisoftwarealliance/magma-mme:latest magma-mme:latest $ docker image tag oaisoftwarealliance/magma-mme:latest magma-mme:latest
$ docker image tag oaisoftwarealliance/oai-enb:develop oai-enb:develop
$ docker image tag oaisoftwarealliance/oai-lte-ue:develop oai-lte-ue:develop
``` ```
```bash ```bash
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+2 -2
View File
@@ -180,7 +180,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -214,7 +214,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+2 -2
View File
@@ -2,7 +2,7 @@ version: '3.8'
services: services:
oai_enb0: oai_enb0:
image: oai-enb:develop image: ioaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -36,7 +36,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+2 -2
View File
@@ -180,7 +180,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -214,7 +214,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+2 -2
View File
@@ -180,7 +180,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -214,7 +214,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+2 -2
View File
@@ -2,7 +2,7 @@ version: '3.8'
services: services:
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -22,7 +22,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+2 -2
View File
@@ -2,7 +2,7 @@ version: '3.8'
services: services:
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -22,7 +22,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+2 -2
View File
@@ -180,7 +180,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: oai-enb:develop image: oaisoftwarealliance/oai-enb:develop
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
@@ -213,7 +213,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: oai-lte-ue:develop image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+3 -3
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-cu: oai-cu:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-cu container_name: rfsim5g-oai-cu
environment: environment:
@@ -197,7 +197,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-du: oai-du:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-du container_name: rfsim5g-oai-du
environment: environment:
@@ -231,7 +231,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+2 -2
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -192,7 +192,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+2 -4
View File
@@ -41,15 +41,13 @@ $ docker pull oaisoftwarealliance/trf-gen-cn5g:latest
$ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-gnb:develop
$ docker pull oaisoftwarealliance/oai-nr-ue:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop
$ docker pull oaisoftwarealliance/proxy:latest $ docker pull oaisoftwarealliance/proxy:develop
``` ```
And **re-tag** them for tutorials' docker-compose file to work. And **re-tag** them for tutorials' docker-compose file to work.
```bash ```bash
$ docker image tag oaisoftwarealliance/oai-gnb:develop oai-gnb:develop $ docker image tag oaisoftwarealliance/proxy:develop oai-lte-multi-ue-proxy:latest
$ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop
$ docker image tag oaisoftwarealliance/proxy:latest oai-lte-multi-ue-proxy:latest
``` ```
```bash ```bash
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+2 -2
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: "l2sim-oai-gnb" container_name: "l2sim-oai-gnb"
network_mode: "host" network_mode: "host"
@@ -211,7 +211,7 @@ services:
retries: 5 retries: 5
oai-nr-ue0: oai-nr-ue0:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: "l2sim-oai-nr-ue0" container_name: "l2sim-oai-nr-ue0"
network_mode: "host" network_mode: "host"
ci-scripts/yaml_files/5g_rfsimulator/README.md
-7
View File
@@ -47,13 +47,6 @@ $ docker pull oaisoftwarealliance/oai-gnb:develop
$ docker pull oaisoftwarealliance/oai-nr-ue:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop
``` ```
And **re-tag** them for tutorials' docker-compose file to work.
```bash
$ docker image tag oaisoftwarealliance/oai-gnb:develop oai-gnb:develop
$ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop
```
```bash ```bash
$ docker logout $ docker logout
``` ```
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+3 -3
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -193,7 +193,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
@@ -216,7 +216,7 @@ services:
retries: 5 retries: 5
oai-nr-ue2: oai-nr-ue2:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue2 container_name: rfsim5g-oai-nr-ue2
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+2 -2
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -183,7 +183,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+2 -2
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -184,7 +184,7 @@ services:
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -21,7 +21,7 @@ services:
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -21,7 +21,7 @@ services:
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -21,7 +21,7 @@ services:
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+2 -2
View File
@@ -163,7 +163,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb: oai-gnb:
image: oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-gnb container_name: rfsim5g-oai-gnb
environment: environment:
@@ -184,7 +184,7 @@ services:
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment: