From 7afedd21f537590d199c28ed38123e53770bdd9f Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Wed, 3 May 2023 17:14:20 +0200
Subject: [PATCH] CI: Pull cluster image - modif of OC project selection

---
 ci-scripts/cls_cluster.py      | 5 +++--
 ci-scripts/cls_containerize.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py
index 648d132b9e..aef6da8a38 100644
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -199,9 +199,10 @@ class Cluster:
 			HELP.EPCSrvHelp(self.imageToPull)
 			sys.exit('Insufficient eNB Parameters')
 		lIpAddr = self.eNBIPAddress
+		ocProjectName = NAMESPACE
 		self.testCase_id = HTML.testCase_id
 		cmd = cls_cmd.getConnection(lIpAddr)
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, self.OCProjectName)
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, ocProjectName)
 		if not succeeded:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
@@ -214,7 +215,7 @@ class Cluster:
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False
 		for image in self.imageToPull:
-			imagePrefix = f'{self.OCRegistry}{self.OCProjectName}'
+			imagePrefix = f'{self.OCRegistry}{ocProjectName}'
 			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 8c684a62d8..6b5e4e50af 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -800,7 +800,7 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()
 
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup', 'oai-gnb-aw2s']
 		for image in imageNames:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'docker rmi oai-ci/{imageTag}'