fixes for other CI pipelines
This commit is contained in:
@@ -9,15 +9,8 @@ idefix:
|
|||||||
HostUsername : oaicicd
|
HostUsername : oaicicd
|
||||||
HostPassword : oaicicd
|
HostPassword : oaicicd
|
||||||
HostSourceCodePath : none
|
HostSourceCodePath : none
|
||||||
dummy1:
|
dummy:
|
||||||
ID: dummy1
|
ID: dummy
|
||||||
Kind : simcom
|
|
||||||
State : disabled
|
|
||||||
Process : quectel-cm
|
|
||||||
HostIPAddress : 192.168.18.187
|
|
||||||
HostUsername : oaicicd
|
|
||||||
HostPassword : oaicicd
|
|
||||||
HostSourceCodePath : none
|
|
||||||
dummy2:
|
dummy2:
|
||||||
ID: dummy2
|
ID: dummy2
|
||||||
Kind : cots
|
Kind : cots
|
||||||
|
|||||||
@@ -1712,6 +1712,7 @@ class OaiCiTest():
|
|||||||
return
|
return
|
||||||
|
|
||||||
if self.ue_id=="":
|
if self.ue_id=="":
|
||||||
|
Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra['dummy']) #RH, temporary, we need a dummy Module_UE object to pass to Ping_common
|
||||||
ueIpStatus = self.GetAllUEIPAddresses()
|
ueIpStatus = self.GetAllUEIPAddresses()
|
||||||
if (ueIpStatus < 0):
|
if (ueIpStatus < 0):
|
||||||
HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
|
HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
|
||||||
|
|||||||
+11
-1
@@ -387,8 +387,18 @@ with open(yaml_file,'r') as f:
|
|||||||
xml_class_list = yaml.load(f,Loader=yaml.FullLoader)
|
xml_class_list = yaml.load(f,Loader=yaml.FullLoader)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#loading UE infrastructure from yaml
|
||||||
|
ue_infra_file='ci_ueinfra.yaml'
|
||||||
|
if (os.path.isfile(ue_infra_file)):
|
||||||
|
yaml_file=ue_infra_file
|
||||||
|
elif (os.path.isfile('ci-scripts/'+ue_infra_file)):
|
||||||
|
yaml_file='ci-scripts/'+ue_infra_file
|
||||||
|
else:
|
||||||
|
logging.error("UE infrastructure yaml file cannot be found")
|
||||||
|
sys.exit("UE infrastructure file cannot be found")
|
||||||
InfraUE=cls_ci_ueinfra.InfraUE() #initialize UE infrastructure class
|
InfraUE=cls_ci_ueinfra.InfraUE() #initialize UE infrastructure class
|
||||||
InfraUE.Get_UE_Infra("ci_ueinfra.yaml") #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite
|
InfraUE.Get_UE_Infra(yaml_file) #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user