Merge branch 'ci_fix_gitpost' into 'develop'

[CI] fix gitpost issue

See merge request oai/openairinterface5g!1408

ci-scripts/Jenkinsfile-trig-nsa

@@ -28,7 +28,6 @@ def pythonExecutor = params.pythonExecutor
 def TARGET_BRANCH = "develop"
 def ALLOW_MERGE = true
 def GitPostArgs = ''
-def DataBaseHost = params.DataBaseHost
 def jobStatus
 
 pipeline {
@@ -72,7 +71,7 @@ pipeline {
                         //calling NSA B200
                         jobName = "RAN-NSA-B200-Module-LTEBOX"
                         jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),                          
+                            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)),
@@ -116,21 +115,21 @@ pipeline {
 
 
                         //calling OAIUE B200
-                        //build job: "RAN-SA-OAIUE-B200-CN5G", 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))
-                        //]
+                        build job: "RAN-SA-OAIUE-B200-CN5G", 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))
+                        ]
                         //calling OAIUE N310
-                        //build job: "RAN-SA-OAIUE-N310-CN5G", 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))
-                        //]
+                        build job: "RAN-SA-OAIUE-N310-CN5G", 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))
+                        ]
 
                         //calling OAIUE N310-X300
                         jobName = "RAN-SA-OAIUE-N310-X300-CN5G"
@@ -146,23 +145,15 @@ pipeline {
                         build_id = jobStatus.getNumber().toString()
                         GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
                         echo GitPostArgs
+
+                        //git report the test results in 1 block, at the end of the test sequence of one MR
+                        dir ('ci-scripts/ran_dashboard') {
+                            sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
+                        }                        
                     }
                 }                                  
             }   
         }
-        stage ('Git Post') {
-          when {
-            expression { params.DataBaseHost != "none" }
-          }
-          agent {label DataBaseHost}
-          steps {
-            script {
-              dir ('ci-scripts/ran_dashboard') {
-                sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
-              }
-            }
-          }
-        }
     }
 }