diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 3f11fad7fb9aed77042d7b7d088a16c2335292f3..16bec1389ce3f52e7151b8dbcc1ac04e5745a137 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -41,7 +41,7 @@ import cls_cmd IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc" NAMESPACE = "oaicicd-ran" OCUrl = "https://api.oai.cs.eurecom.fr:6443" -OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/" +OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr" CI_OC_RAN_NAMESPACE = "oaicicd-ran" CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"] CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""] @@ -51,8 +51,8 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName): if ocUserName == '' or ocPassword == '' or ocProjectName == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter: no OC Credentials') - if OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"): - sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and end on a slash /') + if OCRegistry.startswith("http") or OCRegistry.endswith("/"): + sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /') ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}') if ret.returncode != 0: logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m') @@ -118,8 +118,8 @@ class Cluster: self.OCUserName = "" self.OCPassword = "" self.OCProjectName = "" - self.OCUrl = "https://api.oai.cs.eurecom.fr:6443" - self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/" + self.OCUrl = OCUrl + self.OCRegistry = OCRegistry self.ranRepository = "" self.ranBranch = "" self.ranCommitID = "" @@ -248,6 +248,7 @@ class Cluster: logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}') self.testCase_id = HTML.testCase_id cmd = cls_cmd.getConnection(self.testSvrId) + logging.info(cmd.run('docker --version')) succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE) if not succeeded: logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m') @@ -261,7 +262,7 @@ class Cluster: HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL) return False for image in self.imageToPull: - imagePrefix = f'{self.OCRegistry}{CI_OC_RAN_NAMESPACE}' + imagePrefix = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}' imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge) ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}') if ret.returncode != 0: @@ -291,8 +292,8 @@ class Cluster: if ocUserName == '' or ocPassword == '' or ocProjectName == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter: no OC Credentials') - if self.OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"): - sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /') + if self.OCRegistry.startswith("http") or self.OCRegistry.endswith("/"): + sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /') logging.debug(f'Building on cluster triggered from server: {lIpAddr}') self.cmd = cls_cmd.RemoteCmd(lIpAddr) diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py index 7c0eb51853bf6e66c56ba01564064380d8aa1ee5..e073282635999e15bb82df81d5633a9841204044 100644 --- a/ci-scripts/epc.py +++ b/ci-scripts/epc.py @@ -73,7 +73,7 @@ class EPCManagement(): self.cfgDeploy = '--type start-mini --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap' #from xml, 'mini' is default normal for docker-network.py self.cfgUnDeploy = '--type stop-mini --scenario 1' #from xml, 'mini' is default normal for docker-network.py self.OCUrl = "https://api.oai.cs.eurecom.fr:6443" - self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/" + self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr" self.OCUserName = '' self.OCPassword = '' self.cnID = ''