From 434a0a7d8164e069bd3ffa2b05b29800ea460786 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 10:28:45 +0200 Subject: [PATCH 1/6] CI: adding merge request allow flag: -- if false no forced merge to develop -- if true and if branch is not develop, then forced merge to develop Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-tmp-ran | 10 ++++++++-- ci-scripts/main.py | 11 +++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran index 796271a8d4..83002f82d4 100644 --- a/ci-scripts/Jenkinsfile-tmp-ran +++ b/ci-scripts/Jenkinsfile-tmp-ran @@ -44,9 +44,12 @@ termStatusArray[termSPGW] = false termStatusArray[termMME] = false termStatusArray[termHSS] = false +// Global Parameters. Normally they should be populated when the master job +// triggers the slave job with parameters def eNB_Repository def eNB_Branch def eNB_CommitID +def eNB_AllowMergeRequestProcess = false pipeline { agent { @@ -118,7 +121,7 @@ pipeline { if (params.eNB_Credentials == null) { allParametersPresent = false } - // the following 3 parameters should be pushed by the master trigger + // the following 4 parameters should be pushed by the master trigger // if not present, take the job GIT variables (used for developing) if (params.eNB_Repository == null) { eNB_Repository = env.GIT_URL @@ -138,6 +141,9 @@ pipeline { eNB_CommitID = params.eNB_CommitID } echo "eNB_CommitID : ${eNB_CommitID}" + if (params.eNB_mergeRequest != null) { + eNB_AllowMergeRequestProcess = params.eNB_mergeRequest + } if (params.EPC_IPAddress == null) { allParametersPresent = false @@ -179,7 +185,7 @@ pipeline { [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'], [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'] ]) { - sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}" + sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}" } } catch (Exception e) { currentBuild.result = 'FAILURE' diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 656b1d11a7..b12786fb68 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -59,6 +59,7 @@ class SSHConnection(): self.eNBIPAddress = '' self.eNBRepository = '' self.eNBBranch = '' + self.eNB_AllowMerge = False self.eNBCommitID = '' self.eNBUserName = '' self.eNBPassword = '' @@ -165,8 +166,9 @@ class SSHConnection(): self.command('git checkout -f ' + self.eNBCommitID, '\$', 5) # if the branch is not develop, then it is a merge request and we need to do # the potential merge. Note that merge conflicts should already been checked earlier - if (self.eNBBranch != 'develop') and (self.eNBBranch != 'origin/develop'): - self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5) + if (self.eNB_AllowMerge): + if (self.eNBBranch != 'develop') and (self.eNBBranch != 'origin/develop'): + self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5) self.command('source oaienv', '\$', 5) self.command('cd cmake_targets', '\$', 5) self.command('mkdir -p log', '\$', 5) @@ -998,6 +1000,11 @@ while len(argvs) > 1: elif re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE): matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE) SSH.eNBRepository = matchReg.group(1) + elif re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE): + matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE) + doMerge = matchReg.group(1) + if ((doMerge == 'true') or (doMerge == 'True')): + SSH.eNB_AllowMerge = True elif re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE): matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE) SSH.eNBBranch = matchReg.group(1) From ceaac8dffb8c7ea451e35cdcdd79ce0aa75610d8 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 13:52:57 +0200 Subject: [PATCH 2/6] CI: lower ru gains Signed-off-by: Raphael Defosseux --- ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf | 2 +- ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf | 2 +- ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf index 2feb577f68..2bd28a60df 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf @@ -220,7 +220,7 @@ RUs = ( att_rx = 0; bands = [7]; max_pdschReferenceSignalPower = -27; - max_rxgain = 125; + max_rxgain = 115; eNB_instances = [0]; } diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf index 38df1a28e5..102fc89a13 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf @@ -220,7 +220,7 @@ RUs = ( att_rx = 0; bands = [7]; max_pdschReferenceSignalPower = -27; - max_rxgain = 125; + max_rxgain = 115; eNB_instances = [0]; } diff --git a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf index 213f2bbcd3..fe6e2f0b59 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf @@ -220,7 +220,7 @@ RUs = ( att_rx = 0; bands = [7]; max_pdschReferenceSignalPower = -27; - max_rxgain = 125; + max_rxgain = 115; eNB_instances = [0]; } From 2ac9b4ff96657daf18e4e9efa721a8d4ff7cb32e Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 16:28:27 +0200 Subject: [PATCH 3/6] CI: adding on-the-fly HTML summary within python Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-tmp-ran | 5 ++ ci-scripts/main.py | 133 +++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran index 83002f82d4..93192dd8be 100644 --- a/ci-scripts/Jenkinsfile-tmp-ran +++ b/ci-scripts/Jenkinsfile-tmp-ran @@ -186,6 +186,11 @@ pipeline { [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'] ]) { sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}" + if(fileExists("test_results.html")) { + sh "mv test_results.html test_results-${JOB_NAME}.html" + sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's#TEMPLATE_BUILD_ID#${BUILD_ID}#' test_results-${JOB_NAME}.html" + archiveArtifacts "test_results-${JOB_NAME}.html" + } } } catch (Exception e) { currentBuild.result = 'FAILURE' diff --git a/ci-scripts/main.py b/ci-scripts/main.py index b12786fb68..85e27acb69 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -83,6 +83,10 @@ class SSHConnection(): self.iperf_packetloss_threshold = '' self.UEDevices = [] self.UEIPAddresses = [] + self.htmlFile = '' + self.htmlHeaderCreated = False + self.htmlFooterCreated = False + self.htmlUEConnected = 0 def open(self, ipaddress, username, password): self.ssh = pexpect.spawn('ssh', [username + '@' + ipaddress], timeout = 5) @@ -178,6 +182,7 @@ class SSHConnection(): self.command('echo ' + self.eNBPassword + ' | sudo -S mv log/* ' + 'build_log_' + SSH.testCase_id, '\$', 5) self.command('echo ' + self.eNBPassword + ' | sudo -S mv compile_oai_enb.log ' + 'build_log_' + SSH.testCase_id, '\$', 5) self.close() + self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', 0) def InitializeHSS(self): if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '': @@ -198,6 +203,7 @@ class SSHConnection(): self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f hss.log daemon.log', '\$', 5) self.command('echo ' + self.EPCPassword + ' | sudo -S echo "Starting sudo session" && sudo daemon --unsafe --name=simulated_hss --chdir=/opt/hss_sim0609 ./starthss_real ', '\$', 5) self.close() + self.CreateHtmlTestRow(self.EPCType, 'OK', 0) def InitializeMME(self): if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '': @@ -219,6 +225,7 @@ class SSHConnection(): self.command('cd /opt/ltebox/tools', '\$', 5) self.command('echo ' + self.EPCPassword + ' | sudo -S ./start_mme', '\$', 5) self.close() + self.CreateHtmlTestRow(self.EPCType, 'OK', 0) def InitializeSPGW(self): if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '': @@ -234,6 +241,7 @@ class SSHConnection(): self.command('cd /opt/ltebox/tools', '\$', 5) self.command('echo ' + self.EPCPassword + ' | sudo -S ./start_xGw', '\$', 5) self.close() + self.CreateHtmlTestRow(self.EPCType, 'OK', 0) def InitializeeNB(self): if self.eNBIPAddress == '' or self.eNBUserName == '' or self.eNBPassword == '' or self.eNBSourceCodePath == '': @@ -266,6 +274,7 @@ class SSHConnection(): if (loopCounter == 0): doLoop = False logging.debug('\u001B[1;37;43m eNB logging system did not show got sync! See with attach later \u001B[0m') + self.CreateHtmlTestRow(config_file, 'eNB not showing got sync!', 0) # Not getting got sync is bypassed for the moment #sys.exit(1) self.command('stdbuf -o0 cat enb_' + SSH.testCase_id + '.log', '\$', 10) @@ -274,6 +283,7 @@ class SSHConnection(): time.sleep(6) else: doLoop = False + self.CreateHtmlTestRow(config_file, 'OK', 0) logging.debug('\u001B[1m Initialize eNB Completed\u001B[0m') self.close() @@ -306,6 +316,7 @@ class SSHConnection(): multi_jobs.append(p) for job in multi_jobs: job.join() + self.CreateHtmlTestRow('N/A', 'OK', 0) def AttachUE_common(self, device_id): try: @@ -353,6 +364,7 @@ class SSHConnection(): multi_jobs.append(p) for job in multi_jobs: job.join() + self.CreateHtmlTestRow('N/A', 'OK', len(self.UEDevices)) def DetachUE_common(self, device_id): try: @@ -377,6 +389,7 @@ class SSHConnection(): multi_jobs.append(p) for job in multi_jobs: job.join() + self.CreateHtmlTestRow('N/A', 'OK', 0) def RebootUE_common(self, device_id): try: @@ -431,6 +444,7 @@ class SSHConnection(): multi_jobs.append(p) for job in multi_jobs: job.join() + self.CreateHtmlTestRow('N/A', 'OK', 0) def GetAllUEDevices(self, terminate_ue_flag): if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '': @@ -524,6 +538,7 @@ class SSHConnection(): i = i + 1 for job in multi_jobs: job.join() + self.CreateHtmlTestRow(self.ping_args, 'OK', 0) def Iperf_common(self, lock, UE_IPAddress, device_id, ue_num): try: @@ -660,6 +675,7 @@ class SSHConnection(): i = i + 1 for job in multi_jobs: job.join() + self.CreateHtmlTestRow(self.iperf_args, 'OK', 0) def CheckProcessExist(self, initialize_eNB_flag): multi_jobs = [] @@ -753,6 +769,7 @@ class SSHConnection(): if result is not None: self.command('echo ' + self.eNBPassword + ' | sudo -S killall --signal SIGKILL lte-softmodem || true', '\$', 5) self.close() + self.CreateHtmlTestRow('N/A', 'OK', 0) def TerminateHSS(self): self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword) @@ -774,6 +791,7 @@ class SSHConnection(): self.command('echo ' + self.EPCPassword + ' | sudo -S ./kill_hss.sh', '\$', 5) self.command('rm ./kill_hss.sh', '\$', 5) self.close() + self.CreateHtmlTestRow('N/A', 'OK', 0) def TerminateMME(self): self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword) @@ -802,6 +820,7 @@ class SSHConnection(): self.command('cd /opt/ltebox/tools', '\$', 5) self.command('echo ' + self.EPCPassword + ' | sudo -S ./stop_xGw', '\$', 5) self.close() + self.CreateHtmlTestRow('N/A', 'OK', 0) def TerminateUE_common(self, device_id): try: @@ -829,6 +848,7 @@ class SSHConnection(): multi_jobs.append(p) for job in multi_jobs: job.join() + self.CreateHtmlTestRow('N/A', 'OK', 0) def LogCollectBuild(self): self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword) @@ -905,6 +925,115 @@ class SSHConnection(): self.command('zip spgw.log.zip xGwLog.0', '\$', 60) self.close() #----------------------------------------------------------- +# HTML Reporting.... +#----------------------------------------------------------- + def CreateHtmlHeader(self): + if (not self.htmlHeaderCreated): + self.htmlFile = open('test_results.html', 'w') + self.htmlFile.write('\n') + self.htmlFile.write('\n') + self.htmlFile.write('\n') + self.htmlFile.write(' Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID\n') + self.htmlFile.write(' \n') + self.htmlFile.write('\n') + self.htmlFile.write('\n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write('
\n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID\n') + self.htmlFile.write('
\n') + self.htmlFile.write('
\n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + if (SSH.eNB_AllowMerge): + self.htmlFile.write(' \n') + else: + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + if (SSH.eNB_AllowMerge): + self.htmlFile.write(' \n') + else: + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + if (SSH.eNB_AllowMerge): + self.htmlFile.write(' \n') + else: + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + if (SSH.eNB_AllowMerge): + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write('
GIT Repository' + SSH.eNBRepository + '
Job TriggerMerge-RequestPush to Branch
Source BranchBranch' + SSH.eNBBranch + '
Source Commit IDCommit ID' + SSH.eNBCommitID + '
Target Branchdevelop
\n') + + terminate_ue_flag = True + SSH.GetAllUEDevices(terminate_ue_flag) + self.htmlUEConnected = len(self.UEDevices) + self.htmlFile.write('

' + str(self.htmlUEConnected) + ' UE(s) is(are) connected to ADB bench server

\n') + + self.htmlFile.write('
\n') + self.htmlFile.write('

Test Summary for ' + SSH.testXMLfile + '

\n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + self.htmlFile.write(' \n') + i = 0 + while (i < self.htmlUEConnected): + self.htmlFile.write(' \n') + i += 1 + self.htmlFile.write(' \n') + self.htmlHeaderCreated = True + + def CreateHtmlFooter(self): + if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)): + self.htmlFile.write('
Test IdTest DescTest OptionsTest StatusUE' + str(i) + ' Status
\n') + self.htmlFile.write('\n') + self.htmlFile.write('\n') + self.htmlFile.close() + self.htmlFooterCreated = False + + def CreateHtmlTestRow(self, options, status, ue_status): + if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)): + self.htmlFile.write(' \n') + self.htmlFile.write(' ' + SSH.testCase_id + '\n') + self.htmlFile.write(' ' + SSH.desc + '\n') + self.htmlFile.write(' ' + str(options) + '\n') + if (str(status) == 'OK'): + self.htmlFile.write(' ' + str(status) + '\n') + elif (str(status) == 'KO'): + self.htmlFile.write(' ' + str(status) + '\n') + else: + self.htmlFile.write(' ' + str(status) + '\n') + i = 0 + while (i < self.htmlUEConnected): + if (i < ue_status): + self.htmlFile.write(' -\n') + else: + self.htmlFile.write(' -\n') + i += 1 + self.htmlFile.write(' \n') + +#----------------------------------------------------------- # Usage() #----------------------------------------------------------- def Usage(): @@ -1123,6 +1252,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE): Usage() sys.exit('Insufficient Parameter') + SSH.CreateHtmlHeader() + #read test_case_list.xml file # if no parameters for XML file, use default value if SSH.testXMLfile == '': @@ -1221,6 +1352,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE): SSH.TerminateSPGW() else: sys.exit('Invalid action') + + SSH.CreateHtmlFooter() else: Usage() sys.exit('Invalid mode') From a867e4ebcceeb7d552623c4af84c2c7e6dbe6af8 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 16:38:57 +0200 Subject: [PATCH 4/6] CI: Moving html archiving in case of error Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-tmp-ran | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran index 93192dd8be..df9caac82e 100644 --- a/ci-scripts/Jenkinsfile-tmp-ran +++ b/ci-scripts/Jenkinsfile-tmp-ran @@ -186,11 +186,6 @@ pipeline { [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'] ]) { sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}" - if(fileExists("test_results.html")) { - sh "mv test_results.html test_results-${JOB_NAME}.html" - sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's#TEMPLATE_BUILD_ID#${BUILD_ID}#' test_results-${JOB_NAME}.html" - archiveArtifacts "test_results-${JOB_NAME}.html" - } } } catch (Exception e) { currentBuild.result = 'FAILURE' @@ -324,6 +319,11 @@ pipeline { archiveArtifacts "enb.log.${env.BUILD_ID}.zip" } } + if(fileExists("ci-scripts/test_results.html")) { + sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html" + sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's#TEMPLATE_BUILD_ID#${BUILD_ID}#' test_results-${JOB_NAME}.html" + archiveArtifacts "test_results-${JOB_NAME}.html" + } } } stage('Log Collection (SPGW)') { From 67796d842050bda7026994c637b67808d58dca45 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 16:41:40 +0200 Subject: [PATCH 5/6] CI: pipeline fix Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-tmp-ran | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran index df9caac82e..78f62cd8eb 100644 --- a/ci-scripts/Jenkinsfile-tmp-ran +++ b/ci-scripts/Jenkinsfile-tmp-ran @@ -318,11 +318,11 @@ pipeline { if(fileExists("enb.log.${env.BUILD_ID}.zip")) { archiveArtifacts "enb.log.${env.BUILD_ID}.zip" } - } - if(fileExists("ci-scripts/test_results.html")) { - sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html" - sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's#TEMPLATE_BUILD_ID#${BUILD_ID}#' test_results-${JOB_NAME}.html" - archiveArtifacts "test_results-${JOB_NAME}.html" + if(fileExists("ci-scripts/test_results.html")) { + sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html" + sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's#TEMPLATE_BUILD_ID#${BUILD_ID}#' test_results-${JOB_NAME}.html" + archiveArtifacts "test_results-${JOB_NAME}.html" + } } } } From b6c42575d87370b0ba03c749f90f62feb7acb269 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 2 Aug 2018 16:56:57 +0200 Subject: [PATCH 6/6] CI: adding 20 MHz testcases to FDD band 7 scenario Signed-off-by: Raphael Defosseux --- ci-scripts/xml_files/enb_usrp210_band7.xml | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/ci-scripts/xml_files/enb_usrp210_band7.xml b/ci-scripts/xml_files/enb_usrp210_band7.xml index 4bea6d50e5..6f8cfbad5b 100644 --- a/ci-scripts/xml_files/enb_usrp210_band7.xml +++ b/ci-scripts/xml_files/enb_usrp210_band7.xml @@ -21,7 +21,7 @@ --> - 010101 050101 060101 070101 040101 030101 040301 040501 040601 040602 040603 040401 040201 030201 040101 030111 040301 040511 040611 040612 040613 040401 040201 030201 + 010101 050101 060101 070101 040101 030101 040301 040501 040601 040602 040603 040401 040201 030201 030111 040301 040511 040611 040612 040613 040401 040201 030201 030112 040301 040512 040621 040622 040623 040401 040201 030201 @@ -42,6 +42,12 @@ -O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf + + Initialize_eNB + Initialize eNB (FDD/Band7/20MHz) + -O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf + + Terminate_eNB Terminate eNB @@ -81,6 +87,13 @@ 5 + + Ping + ping (20MHz - 20 sec) + -c 20 + 5 + + Iperf iperf (5MHz - DL/6Mbps/UDP)(60 sec) @@ -123,6 +136,27 @@ 50 + + Iperf + iperf (20MHz - DL/20Mbps/UDP)(60 sec) + -u -b 20M -t 60 -i 1 + 50 + + + + Iperf + iperf (20MHz - DL/40Mbps/UDP)(60 sec) + -u -b 40M -t 60 -i 1 + 50 + + + + Iperf + iperf (20MHz - DL/70Mbps/UDP)(60 sec) + -u -b 70M -t 60 -i 1 + 50 + + Initialize_HSS Initialize HSS