maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix when build is not a listed mr

Browse Source
This commit is contained in:
hardy
2021-12-14 14:46:40 +01:00
parent 465c1f4747
commit a315ffed2c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/ran_dashboard/Hdashboard.py
+11 -6
View File
@@ -61,7 +61,9 @@ class Dashboard:
self.git = self.__getGitData(cmd) #git data from Gitlab self.git = self.__getGitData(cmd) #git data from Gitlab
self.tests = self.__loadCfg('ran_dashboard_cfg.yaml') #tests table setup from yaml self.tests = self.__loadCfg('ran_dashboard_cfg.yaml') #tests table setup from yaml
self.db = self.__loadFromDB() #test results from database self.db = self.__loadFromDB() #test results from database
self.mr_list=[] #mr list in string format
for x in range(len(self.git)):
self.mr_list.append(str(self.git[x]['iid']))
def __loadCfg(self,yaml_file): def __loadCfg(self,yaml_file):
with open(yaml_file,'r') as f: with open(yaml_file,'r') as f:
@@ -534,11 +536,14 @@ def main():
buildid=sys.argv[5] buildid=sys.argv[5]
status=sys.argv[6] status=sys.argv[6]
htmlDash=Dashboard() htmlDash=Dashboard()
htmlDash.Build('singleMR',mr,'/tmp/MR'+mr+'_index.html') if mr in self.mr_list:
htmlDash.CopyToS3('/tmp/MR'+mr+'_index.html','oaitestdashboard','MR'+mr+'/index.html') htmlDash.Build('singleMR',mr,'/tmp/MR'+mr+'_index.html')
htmlDash.Build('Tests','0000','/tmp/Tests_index.html') htmlDash.CopyToS3('/tmp/MR'+mr+'_index.html','oaitestdashboard','MR'+mr+'/index.html')
htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html') htmlDash.Build('Tests','0000','/tmp/Tests_index.html')
htmlDash.PostGitNote(mr,jobname,buildurl,buildid,status) htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html')
htmlDash.PostGitNote(mr,jobname,buildurl,buildid,status)
else:
print("Not a Merge Request => this build is for testing/debug purpose, no report to git")
#test and MR status dash boards, cron based #test and MR status dash boards, cron based
else: else:
htmlDash=Dashboard() htmlDash=Dashboard()