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

aligning all test docker-compose files for image tagging

Browse Source
This commit is contained in:
Bipin Adhikari
2024-09-04 15:38:51 +02:00
committed by Raphael Defosseux
parent ea123a2ac0
commit 5a49dd9afa
37 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+2 -1
View File
@@ -891,7 +891,8 @@ class Containerize():
mySSH.run('cp docker-compose.y*ml ci-docker-compose.yml', 5)
for image in IMAGES:
imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
mySSH.run(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', 2)
mySSH.run(f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{imageTag}@" ci-docker-compose.yml',silent=True)
mySSH.run(f'sed -i -e "s@{image}:latest@oai-ci/{imageTag}@" ci-docker-compose.yml',silent=True) # temporary solution for not using the new branch
# Currently support only one
svcName = self.services[self.eNB_instance]
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+4 -4
View File
@@ -30,7 +30,7 @@ services:
entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
oai_hss:
image: oai-hss:latest
image: oaisoftwarealliance/oai-hss:latest
container_name: l2sim4g-oai-hss
privileged: true
depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
retries: 5
magma_mme:
image: magma-mme:latest
image: oaisoftwarealliance/magma-mme:latest
container_name: l2sim4g-magma-mme
hostname: mme
privileged: true
@@ -102,7 +102,7 @@ services:
retries: 5
oai_spgwc:
image: oai-spgwc:latest
image: oaisoftwarealliance/oai-spgwc:latest
privileged: true
depends_on: [magma_mme]
container_name: l2sim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
retries: 5
oai_spgwu:
image: oai-spgwu-tiny:latest
image: oaisoftwarealliance/oai-spgwu-tiny:latest
privileged: true
container_name: l2sim4g-oai-spgwu-tiny
depends_on: [oai_spgwc]
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+4 -4
View File
@@ -30,7 +30,7 @@ services:
entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
oai_hss:
image: oai-hss:latest
image: oaisoftwarealliance/oai-hss:latest
container_name: rfsim4g-oai-hss
privileged: true
depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
retries: 5
magma_mme:
image: magma-mme:latest
image: oaisoftwarealliance/magma-mme:latest
container_name: rfsim4g-magma-mme
hostname: mme
privileged: true
@@ -102,7 +102,7 @@ services:
retries: 5
oai_spgwc:
image: oai-spgwc:latest
image: oaisoftwarealliance/oai-spgwc:latest
privileged: true
depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
retries: 5
oai_spgwu:
image: oai-spgwu-tiny:latest
image: oaisoftwarealliance/oai-spgwu-tiny:latest
privileged: true
container_name: rfsim4g-oai-spgwu-tiny
depends_on: [oai_spgwc]
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+4 -4
View File
@@ -30,7 +30,7 @@ services:
entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
oai_hss:
image: oai-hss:latest
image: oaisoftwarealliance/oai-hss:latest
container_name: rfsim4g-oai-hss
privileged: true
depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
retries: 5
magma_mme:
image: magma-mme:latest
image: oaisoftwarealliance/magma-mme:latest
container_name: rfsim4g-magma-mme
hostname: mme
privileged: true
@@ -102,7 +102,7 @@ services:
retries: 5
oai_spgwc:
image: oai-spgwc:latest
image: oaisoftwarealliance/oai-spgwc:latest
privileged: true
depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
retries: 5
oai_spgwu:
image: oai-spgwu-tiny:latest
image: oaisoftwarealliance/oai-spgwu-tiny:latest
privileged: true
container_name: rfsim4g-oai-spgwu-tiny
depends_on: [oai_spgwc]
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+4 -4
View File
@@ -30,7 +30,7 @@ services:
entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
oai_hss:
image: oai-hss:latest
image: oaisoftwarealliance/oai-hss:latest
container_name: rfsim4g-oai-hss
privileged: true
depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
retries: 5
magma_mme:
image: magma-mme:latest
image: oaisoftwarealliance/magma-mme:latest
container_name: rfsim4g-magma-mme
hostname: mme
privileged: true
@@ -102,7 +102,7 @@ services:
retries: 5
oai_spgwc:
image: oai-spgwc:latest
image: oaisoftwarealliance/oai-spgwc:latest
privileged: true
depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
retries: 5
oai_spgwu:
image: oai-spgwu-tiny:latest
image: oaisoftwarealliance/oai-spgwu-tiny:latest
privileged: true
container_name: rfsim4g-oai-spgwu-tiny
depends_on: [oai_spgwc]
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+4 -4
View File
@@ -30,7 +30,7 @@ services:
entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
oai_hss:
image: oai-hss:latest
image: oaisoftwarealliance/oai-hss:latest
container_name: rfsim4g-oai-hss
privileged: true
depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
retries: 5
magma_mme:
image: magma-mme:latest
image: oaisoftwarealliance/magma-mme:latest
container_name: rfsim4g-magma-mme
hostname: mme
privileged: true
@@ -102,7 +102,7 @@ services:
retries: 5
oai_spgwc:
image: oai-spgwc:latest
image: oaisoftwarealliance/oai-spgwc:latest
privileged: true
depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
retries: 5
oai_spgwu:
image: oai-spgwu-tiny:latest
image: oaisoftwarealliance/oai-spgwu-tiny:latest
privileged: true
container_name: rfsim4g-oai-spgwu-tiny
depends_on: [oai_spgwc]
ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
network_mode: "host"
container_name: oai-gnb
cap_drop:
ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
network_mode: "host"
container_name: oai-gnb
cap_drop:
ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
network_mode: "host"
container_name: oai-gnb
cap_drop:
ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-nr-ue:
image: oai-nr-ue:latest
image: oaisoftwarealliance/oai-nr-ue:develop
network_mode: host
container_name: oai-nr-ue
cap_drop:
ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: prod-enb-mono-fdd
environment:
ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml
+2 -2
View File
@@ -1,6 +1,6 @@
services:
rru_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-rru-fdd-05Mhz-tm1
network_mode: "host"
@@ -17,7 +17,7 @@ services:
timeout: 5s
retries: 5
rcc_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-rcc-fdd-05Mhz-tm1
network_mode: "host"
ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-05Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-05Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
lte_ue0:
image: oai-lte-ue:latest
image: oaisoftwarealliance/oai-lte-ue:develop
privileged: true
container_name: lte-b200-ue-fdd-10Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-10Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-10Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-10Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-fdd-20Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml
+2 -2
View File
@@ -1,6 +1,6 @@
services:
rru_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-rru-tdd-05Mhz-tm1
network_mode: "host"
@@ -17,7 +17,7 @@ services:
timeout: 5s
retries: 5
rcc_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-rcc-tdd-05Mhz-tm1
network_mode: "host"
ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-tdd-05Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-tdd-05Mhz-tm2
environment:
ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-tdd-10Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-tdd-20Mhz-tm1
environment:
ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_tdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: lte-b200-enb-tdd-20Mhz-tm1
environment:
ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-enb:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: oai-enb
environment:
ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-enb:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: oai-enb
environment:
ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
enb_mono_fdd:
image: oai-enb:latest
image: oaisoftwarealliance/oai-enb:develop
privileged: true
container_name: nsa-b200-enb
ulimits:
ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
gnb_mono_tdd:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: nsa-b200-gnb
cap_drop:
- ALL
ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb-aw2s:latest
image: oaisoftwarealliance/oai-gnb-aw2s:develop
network_mode: "host"
container_name: oai-gnb-aw2s
cap_drop:
ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
gnb_mono_tdd:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-b200-gnb
cap_drop:
- ALL
ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml
+3 -3
View File
@@ -1,6 +1,6 @@
services:
gnb_cucp:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-cucp-gnb
cap_drop:
- ALL
@@ -25,7 +25,7 @@ services:
retries: 5
gnb_cuup:
image: oai-nr-cuup:latest
image: oaisoftwarealliance/oai-nr-cuup:develop
container_name: sa-cuup-gnb
cap_drop:
- ALL
@@ -52,7 +52,7 @@ services:
retries: 5
gnb_du_tdd:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-du-b200-gnb
cap_drop:
- ALL
ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
+2 -2
View File
@@ -1,6 +1,6 @@
services:
gnb_cu:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-cu-gnb
cap_drop:
- ALL
@@ -26,7 +26,7 @@ services:
retries: 5
gnb_du_fdd:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-du-b200-gnb
cap_drop:
- ALL
ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb-fhi72:latest
image: oaisoftwarealliance/oai-gnb-fhi72:develop
cap_add:
- SYS_ADMIN
- IPC_LOCK
ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
oai-gnb:
image: oai-gnb-fhi72:latest
image: oaisoftwarealliance/oai-gnb-fhi72:develop
cap_add:
- SYS_ADMIN
- IPC_LOCK
ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml
+1 -1
View File
@@ -34,7 +34,7 @@ services:
retries: 5
oai-gnb-aerial:
cpuset: "13-20"
image: oai-gnb-aerial:latest
image: oaisoftwarealliance/oai-gnb-aerial:develop
depends_on:
nv-cubb:
condition: service_healthy
ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services:
gnb_mono_tdd:
image: oai-gnb:latest
image: oaisoftwarealliance/oai-gnb:develop
container_name: sa-b200-gnb
cap_drop:
- ALL