Use trf-gen image based on Ubuntu focal to match iperf versions

c093a2cf · Robert Schmidt · d3ef88ed · c093a2cf · c093a2cf · c093a2cf
Commit c093a2cf authored 2 years ago by Robert Schmidt
--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -166,7 +166,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: l2sim4g-trf-gen
        networks:

--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -166,7 +166,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: rfsim4g-trf-gen
        networks:

--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -166,7 +166,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: rfsim4g-trf-gen
        networks:

--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -166,7 +166,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: rfsim4g-trf-gen
        networks:

--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -166,7 +166,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: rfsim4g-trf-gen
        networks:

--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
@@ -37,7 +37,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-smf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
-$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest
+$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 $ docker pull oaisoftwarealliance/oai-gnb:develop
 $ docker pull oaisoftwarealliance/oai-nr-ue:develop

--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: "l2sim-oai-ext-dn"
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -41,7 +41,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-smf:v1.5.0
 $ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
-$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest
+$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 $ docker pull oaisoftwarealliance/oai-gnb:develop
 $ docker pull oaisoftwarealliance/oai-nr-ue:develop

--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -149,7 +149,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.73.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -148,7 +148,7 @@ services:
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        entrypoint: /bin/bash -c \
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"

--- a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
+++ b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
@@ -184,7 +184,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: prod-trf-gen
        networks:

--- a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
+++ b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
@@ -168,7 +168,7 @@ services:
            retries: 5

    trf_gen:
-        image: trf-gen:production
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
        privileged: true
        container_name: prod-trf-gen
        networks: