diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 2ef3e8387a..ca98b967a0 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -289,6 +289,7 @@ class Containerize(): self.deployedContainers = [] self.tsharkStarted = False + self.displayedNewTags = False self.pingContName = '' self.pingOptions = '' self.pingLossThreshold = '' @@ -1062,12 +1063,13 @@ class Containerize(): return 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'] for image in imageNames: tagToUse = self.ImageTagToUse(image) - cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' - self.run_cmd_local_host(cmd) + cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml' + 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] try: @@ -1197,12 +1199,13 @@ class Containerize(): logPath = '../cmake_targets/log/' + ymlPath[1] 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'] for image in imageNames: tagToUse = self.ImageTagToUse(image) - cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' - self.run_cmd_local_host(cmd) + cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml' + self.run_cmd_local_host(cmd, silent=self.displayedNewTags) + silent=self.displayedNewTags = True # check which containers are running for log recovery later cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all' diff --git a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml index b3e3ede92e..546211e5b3 100644 --- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml @@ -180,7 +180,7 @@ services: retries: 5 oai_enb: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: l2sim4g-oai-enb network_mode: "host" @@ -230,7 +230,7 @@ services: retries: 5 oai_ue1: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: l2sim4g-oai-lte-ue1 network_mode: "host" @@ -258,7 +258,7 @@ services: retries: 5 oai_ue2: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: l2sim4g-oai-lte-ue2 network_mode: "host" diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md index d134ffc824..d47c4842de 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md @@ -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-spgwu-tiny:latest oai-spgwu-tiny: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 diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml index ab54c3ada1..18f929a6e8 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml @@ -180,7 +180,7 @@ services: retries: 5 oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -214,7 +214,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml index dea6724926..39c9394769 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: oai_enb0: - image: oai-enb:develop + image: ioaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -36,7 +36,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml index b24ebd367d..3f9d764f3a 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml @@ -180,7 +180,7 @@ services: retries: 5 oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -214,7 +214,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml index ebe2b2f4a0..6cf8ee2677 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml @@ -180,7 +180,7 @@ services: retries: 5 oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -214,7 +214,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml index 39d06f1651..f57b913daf 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -22,7 +22,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml index dc64984068..98cb6d5d53 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -22,7 +22,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml index 63c4965ddb..b3182ba23b 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml @@ -180,7 +180,7 @@ services: retries: 5 oai_enb0: - image: oai-enb:develop + image: oaisoftwarealliance/oai-enb:develop privileged: true container_name: rfsim4g-oai-enb networks: @@ -213,7 +213,7 @@ services: retries: 5 oai_ue0: - image: oai-lte-ue:develop + image: oaisoftwarealliance/oai-lte-ue:develop privileged: true container_name: rfsim4g-oai-lte-ue0 networks: diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index d9d97670d3..a364a1db95 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-cu: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-cu environment: @@ -197,7 +197,7 @@ services: timeout: 5s retries: 5 oai-du: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-du environment: @@ -231,7 +231,7 @@ services: timeout: 5s retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index c3c3797125..42d67b0bdc 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -192,7 +192,7 @@ services: timeout: 5s retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md index adbb6edd44..eb8e58d415 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md @@ -41,15 +41,13 @@ $ docker pull oaisoftwarealliance/trf-gen-cn5g:latest $ docker pull oaisoftwarealliance/oai-gnb: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. ```bash -$ docker image tag oaisoftwarealliance/oai-gnb:develop oai-gnb:develop -$ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop -$ docker image tag oaisoftwarealliance/proxy:latest oai-lte-multi-ue-proxy:latest +$ docker image tag oaisoftwarealliance/proxy:develop oai-lte-multi-ue-proxy:latest ``` ```bash diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml index 265f130c08..3af3bc60cf 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: "l2sim-oai-gnb" network_mode: "host" @@ -211,7 +211,7 @@ services: retries: 5 oai-nr-ue0: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: "l2sim-oai-nr-ue0" network_mode: "host" diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md index 901aa37f78..1e2cb638eb 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/README.md +++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md @@ -47,13 +47,6 @@ $ docker pull oaisoftwarealliance/oai-gnb: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 $ docker logout ``` diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index ab78b35ab5..bc271e0643 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -193,7 +193,7 @@ services: timeout: 5s retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: @@ -216,7 +216,7 @@ services: retries: 5 oai-nr-ue2: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue2 environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 64a507e4f6..a298c21748 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -183,7 +183,7 @@ services: timeout: 5s retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 06f1dcc80e..d33738e2f7 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -184,7 +184,7 @@ services: retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml index 1487aa26c0..dbab2002a7 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.8' services: oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -21,7 +21,7 @@ services: retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index 11264e5348..2705a69f10 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.8' services: oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -21,7 +21,7 @@ services: retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml index 9f080478c7..2afa9027f3 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.8' services: oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -21,7 +21,7 @@ services: retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 51d21efc60..e6e525389b 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -163,7 +163,7 @@ services: timeout: 5s retries: 5 oai-gnb: - image: oai-gnb:develop + image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb environment: @@ -184,7 +184,7 @@ services: retries: 5 oai-nr-ue: - image: oai-nr-ue:develop + image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue environment: