Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr

ci-scripts/Jenkinsfile-gitlab

@@ -328,12 +328,9 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test on CI bench #1") {
-                    stages {
                 stage ("Test FDD - Band 7 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-FDD-Band7") {
                                     build job: 'eNB-CI-FDD-Band7-B210',
@@ -355,9 +352,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -382,7 +376,6 @@ pipeline {
                 stage ("Test TDD - Band 40 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-TDD-Band40") {
                                     build job: 'eNB-CI-TDD-Band40-B210',
@@ -404,9 +397,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -431,7 +421,6 @@ pipeline {
                 stage ("Test IF4p5 - FDD - Band 7 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
                                     build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
@@ -453,9 +442,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -480,7 +466,6 @@ pipeline {
                 stage ("Test IF4p5 - TDD - Band 40 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
                                     build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
@@ -502,9 +487,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -527,8 +509,6 @@ pipeline {
                     }
                 }
             }
-                }
-            }
             post {
                 always {
                     script {

ci-scripts/Jenkinsfile-tmp-ran

@@ -61,6 +61,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
+        lock (ciSmartPhoneResource)
     }
     // the following parameter options are commented out so it shows the ones
     // that you SHALL have to run the job.
@@ -184,7 +185,6 @@ pipeline {
             steps {
                 script {
                     dir ('ci-scripts') {
-                      lock (ciSmartPhoneResource) {
                         try {
                             echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
                             withCredentials([
@@ -201,7 +201,6 @@ pipeline {
                 }
             }
         }
-        }
         stage ("Terminate") {
             parallel {
                 stage('Terminate UE') {