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

change git post appearance

Browse Source
This commit is contained in:
hardy
2021-12-09 14:26:43 +01:00
parent 3166289ef5
commit 465c1f4747
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+1 -1
View File
@@ -390,7 +390,7 @@ pipeline {
steps { steps {
script { script {
dir ('ci-scripts/ran_dashboard') { dir ('ci-scripts/ran_dashboard') {
sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${StatusForDb} " sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${env.BUILD_ID} ${StatusForDb} "
} }
} }
} }
ci-scripts/ran_dashboard/Hdashboard.py
+8 -7
View File
@@ -507,23 +507,23 @@ class Dashboard:
s3.meta.client.copy(copy_source, 'oaitestdashboard', path+'/'+ 'test_styles.css') s3.meta.client.copy(copy_source, 'oaitestdashboard', path+'/'+ 'test_styles.css')
def PostGitNote(self,mr,jobname,buildurl,status): def PostGitNote(self,mr,jobname,buildurl,buildid,status):
gl = gitlab.Gitlab.from_config('OAI') gl = gitlab.Gitlab.from_config('OAI')
project_id = 223 project_id = 223
project = gl.projects.get(project_id) project = gl.projects.get(project_id)
editable_mr = project.mergerequests.get(int(mr)) editable_mr = project.mergerequests.get(int(mr))
mr_notes = editable_mr.notes.list() mr_notes = editable_mr.notes.list()
mr_note = editable_mr.notes.create({ mr_note = editable_mr.notes.create({
'body': 'Completed Test : '+jobname+' , status : <b>'+status+'</b><br>'+\ 'body': 'Completed Test : '+jobname+', status: <b>'+status+'</b>, '+\
'Link to this test : '+buildurl+'<br>'+\ '(<a href="'+buildurl+'">'+buildid+'</a>)<br>'+\
'<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html">Consolidated Test Results (All End-to-End LTE/NSA/SA/2x2/OAIUE)</a>' '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html">Consolidated Test Results</a>'
}) })
editable_mr.save() editable_mr.save()
def main(): def main():
#call from Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${StatusForDb} " #call from Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${env.BUILD_ID} ${StatusForDb} "
#individual MR test results + test dashboard, event based (end of jenkins pipeline) #individual MR test results + test dashboard, event based (end of jenkins pipeline)
if len(sys.argv)>1: if len(sys.argv)>1:
@@ -531,13 +531,14 @@ def main():
mr=sys.argv[2] mr=sys.argv[2]
jobname=sys.argv[3] jobname=sys.argv[3]
buildurl=sys.argv[4] buildurl=sys.argv[4]
status=sys.argv[5] buildid=sys.argv[5]
status=sys.argv[6]
htmlDash=Dashboard() htmlDash=Dashboard()
htmlDash.Build('singleMR',mr,'/tmp/MR'+mr+'_index.html') htmlDash.Build('singleMR',mr,'/tmp/MR'+mr+'_index.html')
htmlDash.CopyToS3('/tmp/MR'+mr+'_index.html','oaitestdashboard','MR'+mr+'/index.html') htmlDash.CopyToS3('/tmp/MR'+mr+'_index.html','oaitestdashboard','MR'+mr+'/index.html')
htmlDash.Build('Tests','0000','/tmp/Tests_index.html') htmlDash.Build('Tests','0000','/tmp/Tests_index.html')
htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html') htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html')
htmlDash.PostGitNote(mr,jobname,buildurl,status) htmlDash.PostGitNote(mr,jobname,buildurl,buildid,status)
#test and MR status dash boards, cron based #test and MR status dash boards, cron based
else: else:
htmlDash=Dashboard() htmlDash=Dashboard()