From cded721189403bf45410ee6c1e5e5488f9886bd2 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 25 Sep 2024 15:42:00 +0200 Subject: [PATCH] Remove unused CI XML and Python code --- ci-scripts/main.py | 15 ------- ci-scripts/ran.py | 35 ---------------- ci-scripts/xml_class_list.yml | 1 - ci-scripts/xml_files/fr1_enb_build.xml | 58 -------------------------- 4 files changed, 109 deletions(-) delete mode 100644 ci-scripts/xml_files/fr1_enb_build.xml diff --git a/ci-scripts/main.py b/ci-scripts/main.py index ea3963fbca..017e9b6f37 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -140,19 +140,6 @@ def GetParametersFromXML(action): if proxy_commit is not None: CONTAINERS.proxyCommit = proxy_commit - elif action == 'WaitEndBuild_eNB': - RAN.Build_eNB_args=test.findtext('Build_eNB_args') - eNB_instance=test.findtext('eNB_instance') - if (eNB_instance is None): - RAN.eNB_instance=0 - else: - RAN.eNB_instance=int(eNB_instance) - eNB_serverId=test.findtext('eNB_serverId') - if (eNB_serverId is None): - RAN.eNB_serverId[RAN.eNB_instance]='0' - else: - RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId - elif action == 'Initialize_eNB': RAN.eNB_Trace=test.findtext('eNB_Trace') RAN.eNB_Stats=test.findtext('eNB_Stats') @@ -689,8 +676,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re try: if action == 'Build_eNB': RAN.BuildeNB(HTML) - elif action == 'WaitEndBuild_eNB': - RAN.WaitBuildeNBisFinished(HTML) elif action == 'Custom_Command': RAN.CustomCommand(HTML) if RAN.prematureExit: diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index ad1b2bc5e4..56424c4f25 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -224,41 +224,6 @@ class RANManagement(): mySSH.close() self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id, HTML) - def WaitBuildeNBisFinished(self, HTML): - if self.eNB_serverId[self.eNB_instance] == '0': - lIpAddr = self.eNBIPAddress - lUserName = self.eNBUserName - lPassWord = self.eNBPassword - lSourcePath = self.eNBSourceCodePath - elif self.eNB_serverId[self.eNB_instance] == '1': - lIpAddr = self.eNB1IPAddress - lUserName = self.eNB1UserName - lPassWord = self.eNB1Password - lSourcePath = self.eNB1SourceCodePath - elif self.eNB_serverId[self.eNB_instance] == '2': - lIpAddr = self.eNB2IPAddress - lUserName = self.eNB2UserName - lPassWord = self.eNB2Password - lSourcePath = self.eNB2SourceCodePath - if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': - HELP.GenericHelp(CONST.Version) - sys.exit('Insufficient Parameter') - logging.debug('Waiting for end of build on server: ' + lIpAddr) - mySSH = SSH.SSHConnection() - mySSH.open(lIpAddr, lUserName, lPassWord) - count = 40 - buildOAIprocess = True - while (count > 0) and buildOAIprocess: - mySSH.command('ps aux | grep --color=never build_ | grep -v grep', '\$', 6) - result = re.search('build_oai', mySSH.getBefore()) - if result is None: - buildOAIprocess = False - else: - count -= 1 - time.sleep(30) - mySSH.close() - self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML) - def CustomCommand(self, HTML): logging.info(f"Executing custom command on {self.node}") cmd = cls_cmd.getConnection(self.node) diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml index 617be568cc..deba963bc6 100755 --- a/ci-scripts/xml_class_list.yml +++ b/ci-scripts/xml_class_list.yml @@ -6,7 +6,6 @@ - Run_T2Test - Run_NRulsimTest - Build_eNB - - WaitEndBuild_eNB - Initialize_eNB - Terminate_eNB - Initialize_UE diff --git a/ci-scripts/xml_files/fr1_enb_build.xml b/ci-scripts/xml_files/fr1_enb_build.xml deleted file mode 100644 index 6ea1ccfd29..0000000000 --- a/ci-scripts/xml_files/fr1_enb_build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - build-tab - Build - wrench - - 100000 - 000001 - 000002 - - - - - Build_eNB - Build eNB - -w USRP -c --eNB --ninja - 0 - 0 - True - True - - - - WaitEndBuild_eNB - Wait for end of Build eNB - 0 - 0 - - - - Custom_Command - To reboot USRP - obelix - ssh root@172.21.19.13 reboot ; sleep 45 - - -