diff --git a/ci-scripts/build_fr1_from_yaml.py b/ci-scripts/build_fr1_from_yaml.py deleted file mode 100755 index 4687c3ee02..0000000000 --- a/ci-scripts/build_fr1_from_yaml.py +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -Created on Tue Jul 7 23:04:51 2020 - -@author: hardy -""" - - - -import yaml -import sys -import subprocess - - - -def main(): - f_yaml=sys.argv[1] - f_sh=sys.argv[2] - #filename='py_params_template.yaml' - with open(f_yaml,'r') as file: - # The FullLoader parameter handles the conversion from YAML - # scalar values to Python the dictionary format - print('Loading '+f_yaml) - params = yaml.load(file,Loader=yaml.FullLoader) - - - with open(f_sh,'w') as f: - f.write('#!/bin/sh\n') - for i in range (0, len(params['steps'])): - step=params['steps'][i].split(',') - mode=step[0] - f_xml=step[1] - line='python3 main.py ' + \ - '--mode='+ mode + ' ' + \ - '--ranRepository=' + params['ranRepository'] + ' ' + \ - '--ranBranch=' + params['ranBranch'] + ' ' + \ - '--ranCommitID=' + params['ranCommitID'] + ' ' + \ - '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \ - '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \ - \ - '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \ - '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \ - '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \ - '--UESourceCodePath=' + params['UE']['UESourceCodePath'] + ' ' + \ - \ - '--EPCIPAddress=' + params['EPC']['EPCIPAddress'] + ' ' + \ - '--EPCUserName=' + params['EPC']['EPCUserName'] + ' ' + \ - '--EPCPassword=' + params['EPC']['EPCPassword'] + ' ' + \ - '--EPCSourceCodePath=' + params['EPC']['EPCSourceCodePath'] + ' ' + \ - '--EPCType=' + params['EPC']['EPCType'] + ' ' + \ - \ - '--eNBIPAddress=' + params['RAN'][0]['eNBIPAddress'] + ' ' + \ - '--eNBUserName=' + params['RAN'][0]['eNBUserName'] + ' ' + \ - '--eNBPassword=' + params['RAN'][0]['eNBPassword'] + ' ' + \ - '--eNBSourceCodePath=' + params['RAN'][0]['eNBSourceCodePath'] + ' ' + \ - \ - '--eNB1IPAddress=' + params['RAN'][1]['eNB1IPAddress'] + ' ' + \ - '--eNB1UserName=' + params['RAN'][1]['eNB1UserName'] + ' ' + \ - '--eNB1Password=' + params['RAN'][1]['eNB1Password'] + ' ' + \ - '--eNB1SourceCodePath=' + params['RAN'][1]['eNB1SourceCodePath'] + ' ' - if mode!="InitiateHtml": - line+='--XMLTestFile=' + f_xml - #if mode is InitiateHTML we have a special processing to mention all xml files from the list - #loop starting at 1 to avoid the xml file mentioned with InitiateHtml in yaml file (file is none) - else: - for i in range (1, len(params['steps'])): - step=params['steps'][i].split(',') - f_xml=step[1] - line+='--XMLTestFile=' + f_xml+' ' - line+='\n' - print(line) - f.write(line) - subprocess.call(['chmod','777',f_sh]) - -if __name__ == "__main__": - main() - - diff --git a/ci-scripts/build_fr1_template.yaml b/ci-scripts/build_fr1_template.yaml deleted file mode 100755 index bedeeb09d7..0000000000 --- a/ci-scripts/build_fr1_template.yaml +++ /dev/null @@ -1,40 +0,0 @@ - -ranRepository : https://gitlab.eurecom.fr/oai/openairinterface5g.git -ranBranch : integration_2021_wk13_a -ranCommitID : 104aa7eed5d6702c1b9da663414079ef698da206 -ranAllowMerge : 'yes' -ranTargetBranch : develop - -steps: - - InitiateHtml,none - - TesteNB,xml_files/fr1_multi_node_build.xml - - TesteNB,xml_files/fr1_epc_start.xml - - TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate - - TesteNB,xml_files/fr1_epc_closure.xml - -RAN: - - eNBIPAddress : 192.168.18.199 #eNB on Minimassive - eNBUserName : oaicicd - eNBPassword : HzB*nkryaITdVd08TKlT#2Z5a!7M#~qn - eNBSourceCodePath : /tmp/CI-FR1-eNB - - eNB1IPAddress : 192.168.18.198 #gNB on Mozart - eNB1UserName : oaicicd - eNB1Password : 7zkDOFgh@w3HvRBMPTMh@BAx - eNB1SourceCodePath : /tmp/CI-FR1-gNB - - -EPC: #on Nikaia - EPCIPAddress : 192.168.18.99 - EPCUserName : nikaia - EPCPassword : linux - EPCSourceCodePath : /tmp/CI-FR1-EPC - EPCType : ltebox - - -UE: - UEIPAddress : none - UEUserName : none - UEPassword : none - UESourceCodePath : none - - diff --git a/ci-scripts/cls_log_mgt.py b/ci-scripts/cls_log_mgt.py deleted file mode 100644 index a78eee5a33..0000000000 --- a/ci-scripts/cls_log_mgt.py +++ /dev/null @@ -1,94 +0,0 @@ -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ -#--------------------------------------------------------------------- -# -# Required Python Version -# Python 3.x -# -#--------------------------------------------------------------------- - -#USAGE: -# log=Log_Mgt(Username,IPAddress,Password,Path) -# log.LogRotation() - - - -import logging -import re -import subprocess -import sshconnection - -class Log_Mgt: - - def __init__(self,Username, IPAddress,Password,Path): - self.Username=Username - self.IPAddress=IPAddress - self.Password=Password - self.path=Path - -#-----------------$ -#PRIVATE# Methods$ -#-----------------$ - - - def __CheckUsedSpace(self): - HOST=self.Username+'@'+self.IPAddress - COMMAND="df "+ self.path - ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE) - result = ssh.stdout.readlines() - s=result[1].decode('utf-8').rstrip()#result[1] is the second line with the results we are looking for - used=s.split()[4] #get 4th field ex: 70% - m = re.match('^(\d+)\%',used) - if m is not None: - return int(m.group(1)) - - def __RemoveOldest(self, days): - mySSH = sshconnection.SSHConnection() - mySSH.open(self.IPAddress, self.Username, self.Password) - COMMAND='echo ' + self.Password + ' | sudo -S find ' + self.path + ' -type f -mtime +' + str(days) + ' -delete' - mySSH.command(COMMAND,'\$',20) - mySSH.close() - - - -#-----------------$ -#PUBLIC Methods$ -#-----------------$ - - - def LogRotation(self): - doLoop = True - nbDays = 14 - while doLoop and nbDays > 1: - used_space = self.__CheckUsedSpace() #avail space in target folder - if used_space > 80 : - logging.debug('\u001B[1;37;41m Used Disk (' + str(used_space) + '%) > 80%, on ' + self.Username+'@'+self.IPAddress + '\u001B[0m') - logging.debug('\u001B[1;37;41m Removing Artifacts older than ' + str(nbDays) + ' days \u001B[0m') - self.__RemoveOldest(nbDays) - nbDays -= 1 - else: - logging.debug('Used Disk (' + str(used_space) + '%) < 80%, on ' + self.Username+'@'+self.IPAddress +', no cleaning required') - doLoop = False - - - - - - diff --git a/ci-scripts/cls_module.py b/ci-scripts/cls_module.py index c56638777c..f5539606a4 100644 --- a/ci-scripts/cls_module.py +++ b/ci-scripts/cls_module.py @@ -35,8 +35,6 @@ import subprocess from datetime import datetime import yaml -#for log rotation mgt -import cls_log_mgt import cls_cmd class Module_UE: @@ -220,25 +218,6 @@ class Module_UE: def _disableTrace(self): raise Exception("not implemented") - mySSH = sshconnection.SSHConnection() - mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword) - mySSH.command('echo ' + ' ' + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5) - mySSH.close() - def _logCollect(self): raise Exception("not implemented") - mySSH = sshconnection.SSHConnection() - mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword) - #archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix - now=datetime.now() - now_string = now.strftime("%Y%m%d-%H%M") - source='ci_qlog' - destination= self.LogStore + '/ci_qlog_'+now_string+'.zip' - #qlog artifact is zipped into the target folder - mySSH.command('echo $USER; echo ' + ' ' + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10) - mySSH.close() - #post action : log cleaning to make sure enough space is reserved for the next run - Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore) - return destination -