diff --git a/ci-scripts/cls_cots_ue.py b/ci-scripts/cls_cots_ue.py index 3e4c8179a8..23feba982b 100644 --- a/ci-scripts/cls_cots_ue.py +++ b/ci-scripts/cls_cots_ue.py @@ -78,8 +78,8 @@ class CotsUe: current_state = self.Check_Airplane() retry+=1 if current_state != target_state: - print("ATTENTION : Could not toggle to : "+target_state_str) - print("Current state is : "+ str(current_state)) + logging.error("ATTENTION : Could not toggle to : "+target_state_str) + logging.error("Current state is : "+ str(current_state)) else: print("Airplane mode is already "+ target_state_str) mySSH.command('sudo ./adb kill-server','$',5) diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index 5673b4c082..6ebecec843 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -431,7 +431,8 @@ class RANManagement(): os.remove('./tmp_build' + testcaseId + '.zip') mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword) mySSH.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5) - mySSH.command('unzip -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5) + #-qq quiet / -u update orcreate files + mySSH.command('unzip -u -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5) mySSH.command('rm -f tmp_build' + testcaseId + '.zip', '\$', 5) mySSH.close() else: diff --git a/ci-scripts/xml_files/fr1_multi_node_build.xml b/ci-scripts/xml_files/fr1_multi_node_build.xml index b2c0daa74e..579eef27a8 100644 --- a/ci-scripts/xml_files/fr1_multi_node_build.xml +++ b/ci-scripts/xml_files/fr1_multi_node_build.xml @@ -25,41 +25,37 @@ Build wrench - 010101 010102 - 000101 000102 + 000001 000002 + 000003 000004 - + Build_eNB Build eNB - -w USRP -c --eNB --ninja + -w USRP -c --eNB 0 0 - True - + WaitEndBuild_eNB Wait for end of Build eNB - -w USRP -c --eNB --ninja 0 0 - + Build_eNB Build gNB - -w USRP -c --gNB --ninja + -w USRP -c --gNB 1 1 - True - + WaitEndBuild_eNB Wait for end of Build gNB - -w USRP -c --gNB --ninja 1 1 diff --git a/ci-scripts/xml_files/fr1_toggle_cots_ue.xml b/ci-scripts/xml_files/fr1_toggle_cots_ue.xml index 371063c791..ee4d36f00a 100644 --- a/ci-scripts/xml_files/fr1_toggle_cots_ue.xml +++ b/ci-scripts/xml_files/fr1_toggle_cots_ue.xml @@ -25,11 +25,11 @@ Airplane tasks - 010101 + 010000 - + COTS_UE_Airplane Toggle COTS Airplane mode ON ON