From a582ac99e5cf71f000e063fc20c5026aa3a2f099 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 12 May 2022 09:19:27 +0200
Subject: [PATCH 1/2] Trigger Amarisoft in NSA tests

---
 ci-scripts/Jenkinsfile-trig-nsa | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ci-scripts/Jenkinsfile-trig-nsa b/ci-scripts/Jenkinsfile-trig-nsa
index 772b34231a..3616b2c404 100644
--- a/ci-scripts/Jenkinsfile-trig-nsa
+++ b/ci-scripts/Jenkinsfile-trig-nsa
@@ -113,6 +113,21 @@ pipeline {
                         GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
                         echo GitPostArgs
 
+                        //calling SA-AmariS
+                        jobName = "RAN-SA-AmariS-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
                         //calling OAIUE N310-X300
                         jobName = "RAN-SA-OAIUE-N310-X300-CN5G"
                         jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [

From 7c5a82bf1c671bbf95eb1beb7e3b1e74a2af9c82 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 12 May 2022 09:20:31 +0200
Subject: [PATCH 2/2] Format Hdashboard Gitlab post using Markdown

---
 ci-scripts/ran_dashboard/Hdashboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/ran_dashboard/Hdashboard.py b/ci-scripts/ran_dashboard/Hdashboard.py
index 1b65c7af4f..993d0dded8 100644
--- a/ci-scripts/ran_dashboard/Hdashboard.py
+++ b/ci-scripts/ran_dashboard/Hdashboard.py
@@ -528,15 +528,15 @@ class Dashboard:
             editable_mr = project.mergerequests.get(int(mr))
             mr_notes = editable_mr.notes.list(all=True)
 
-            body = '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html">Consolidated Test Results</a><br>'+\
-                'Tested CommitID: ' + commit + '<br>'
+            body =  '[Consolidated Test Results](https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html)\\\n'
+            body += 'Tested CommitID: ' + commit + '\\\n'
 
             for i in range(0,n_tests):
                 jobname = args[4*i]
                 buildurl = args[4*i+1]
                 buildid = args[4*i+2]
                 status = args[4*i+3]
-                body += jobname+', status is <b>'+status+'</b>, (<a href="'+buildurl+'">'+buildid+'</a>)<br>'
+                body += jobname+': **'+status+'** ([' + buildid + '](' + buildurl + '))\\\n'
 
             #create new note
             mr_note = editable_mr.notes.create({