From 71bd10b4a261c10fdc7020b4e9f05190350689fd Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 2 Oct 2024 12:49:53 +0200
Subject: [PATCH] docker-compose: write correct container image to use for 4G
 and asan

---
 ci-scripts/cls_containerize.py                              | 4 +++-
 ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml       | 6 +++---
 .../yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml  | 4 ++--
 .../4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml        | 4 ++--
 .../yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml  | 4 ++--
 .../yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml  | 4 ++--
 .../yaml_files/4g_rfsimulator_fembms/docker-compose.yml     | 4 ++--
 .../yaml_files/4g_rfsimulator_mbms/docker-compose.yml       | 4 ++--
 .../yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml  | 4 ++--
 9 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 3fdf10004b..6652354c2c 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -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")
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 c02b009eea..9f40fb856d 100644
--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -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"
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 97c4ee82ab..d41b9dfc4b 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
@@ -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:
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 2bc0e97a35..3988f6e861 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
@@ -1,6 +1,6 @@
 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:
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 c77dfdfd27..fd8f1d11e7 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
@@ -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:
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 25e3d797bb..5565dd6495 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
@@ -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:
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 da5399d5e6..394a9edf90 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -1,6 +1,6 @@
 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:
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 d3a2f02ab2..c6335f7edf 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
@@ -1,6 +1,6 @@
 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:
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 a3ce6f4de6..ce3b106a42 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
@@ -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: