Merge remote-tracking branch 'origin/ci-improvements-sep' into integration_2022_wk40

ci-scripts/Jenkinsfile-GitLab-Container

@@ -24,8 +24,9 @@
 def nodeExecutor = params.nodeExecutor
 
 // Tags to shorten pipeline duration
-def doMandatoryTests = false
-def doFullTestsuite = false
+def doBuild = true
+def do4Gtest = false
+def do5Gtest = false
 
 //
 def gitCommitAuthorEmailAddr
@@ -56,26 +57,30 @@ pipeline {
             LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid
             LABEL_CHECK = LABEL_CHECK.trim()
             if (LABEL_CHECK == 'NONE') {
-              def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request has none of the mandatory labels:\n\n"
-              message += " - BUILD-ONLY\n"
-              message += " - 4G-LTE\n"
-              message += " - 5G-NR\n"
-              message += " - CI\n\n"
+              def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request should have one of the mandatory labels:\n\n"
+              message += " - ~documentation (don't perform any stages)\n"
+              message += " - ~BUILD-ONLY (execute only build stages)\n"
+              message += " - ~4G-LTE (perform 4G tests)\n"
+              message += " - ~5G-NR (perform 5G tests)\n"
+              message += " - ~CI (perform both 4G and 5G tests)\n\n"
               message += "Not performing CI due to lack of labels"
               addGitLabMRComment comment: message
               error('Not performing CI due to lack of labels')
             } else if (LABEL_CHECK == 'FULL') {
-              doMandatoryTests = true
-              doFullTestsuite = true
+              do4Gtest = true
+              do5Gtest = true
+            } else if (LABEL_CHECK == "SHORTEN-4G") {
+              do4Gtest = true
             } else if (LABEL_CHECK == 'SHORTEN-5G') {
-              doMandatoryTests = true
+              do5Gtest = true
+            } else if (LABEL_CHECK == 'documentation') {
+              doBuild = false
             } else {
-              def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): We will perform only build stages on your Merge Request"
-              addGitLabMRComment comment: message
+              // is "BUILD-ONLY", will only build
             }
           } else {
-            doMandatoryTests = true
-            doFullTestsuite = true
+            do4Gtest = true
+            do5Gtest = true
           }
         }
       }
@@ -116,11 +121,12 @@ pipeline {
     // Build Stages are Mandatory
     // Later we will add a Ubuntu20 build
     stage ("Image Building Processes") {
+      when { expression {doBuild} }
       parallel {
-        stage ("Ubuntu18 Build") {
+        stage ("Ubuntu18-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Images-Build')
+              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Image-Builder')
             }
           }
           post {
@@ -155,10 +161,10 @@ pipeline {
             }
           }
         }
-        stage ("CppCheck Analysis") {
+        stage ("cppcheck") {
           steps {
             script {
-              triggerSlaveJob ('RAN-cppcheck', 'CppCheck Analysis')
+              triggerSlaveJob ('RAN-cppcheck', 'cppcheck')
             }
           }
           post {
@@ -177,12 +183,13 @@ pipeline {
       }
     }
     stage ("Image Test Processes") {
+      when { expression {doBuild} }
       parallel {
-        stage ("Physical Simulators") {
-          when { expression {doMandatoryTests} }
+        stage ("PhySim-Cluster") {
+          when { expression {do4Gtest || do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-PhySim-Cluster', 'Test-Physim-Cluster')
+              triggerSlaveJob ('RAN-PhySim-Cluster', 'PhySim-Cluster')
             }
           }
           post {
@@ -198,11 +205,11 @@ pipeline {
             }
           }
         }
-        stage ("4G RF Simulators") {
-          when { expression {doMandatoryTests} }
+        stage ("RF-Sim-Test-4G") {
+          when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'Test-RF-Sim-Container-4G')
+              triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'RF-Sim-Test-4G')
             }
           }
           post {
@@ -218,11 +225,11 @@ pipeline {
             }
           }
         }
-        stage ("5G RF Simulators") {
-          when { expression {doMandatoryTests} }
+        stage ("RF-Sim-Test-5G") {
+          when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'Test-RF-Sim-Container-5G')
+              triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
             }
           }
           post {
@@ -238,11 +245,11 @@ pipeline {
             }
           }
         }
-        stage ("4G L2 Simulators") {
-          when { expression {doMandatoryTests} }
+        stage ("L2-Sim-Test-4G") {
+          when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'Test-L2-Sim-Container-4G')
+              triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'L2-Sim-Test-4G')
             }
           }
           post {
@@ -258,11 +265,11 @@ pipeline {
             }
           }
         }
-        stage ("5G L2 Simulators") {
-          when { expression {doMandatoryTests} }
+        stage ("L2-Sim-Test-5G") {
+          when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'Test-L2-Sim-Container-5G')
+              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
             }
           }
           post {
@@ -278,11 +285,11 @@ pipeline {
             }
           }
         }
-        stage ("NSA B200 Sanity Check") {
-          when { expression {doMandatoryTests} }
+        stage ("NSA-B200-Module-LTEBOX-Container") {
+          when { expression {do4Gtest || do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'Test-NSA-B200')
+              triggerSlaveJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'NSA-B200-Module-LTEBOX-Container')
             }
           }
           post {
@@ -298,11 +305,11 @@ pipeline {
             }
           }
         }
-        stage ("SA B200 Sanity Check") {
-          when { expression {doMandatoryTests} }
+        stage ("SA-B200-Module-SABOX-Container") {
+          when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-B200-Module-SABOX-Container', 'Test-SA-B200')
+              triggerSlaveJob ('RAN-SA-B200-Module-SABOX-Container', 'SA-B200-Module-SABOX-Container')
             }
           }
           post {
@@ -318,17 +325,17 @@ pipeline {
             }
           }
         }
-        stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") {
-          when { expression {doMandatoryTests} }
+        stage ("gNB-N300-Timing-Phytest-LDPC") {
+          when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE')
+              triggerSlaveJob ('RAN-gNB-N300-Timing-Phytest-LDPC', 'gNB-N300-Timing-Phytest-LDPC')
             }
           }
           post {
             always {
               script {
-                finalizeSlaveJob('RAN-gNB-nrUE-MONO-TDD-Band78-N300')
+                finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
               }
             }
             failure {
@@ -339,11 +346,11 @@ pipeline {
           }
         }
         //avra is offline, re-enable once it is available
-        //stage ("Test T1 Offload") {
-        //  when { expression {doMandatoryTests} }
+        //stage ("T1-Offload-Test") {
+        //  when { expression {do5Gtest} }
         //  steps {
         //    script {
-        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'Test-T1-Offload')
+        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'T1-Offload-Test')
         //    }
         //  }
         //  post {
@@ -361,11 +368,11 @@ pipeline {
         //}
       }
     }
-    stage ("Images Push to Registries") {
-      when { expression {"PUSH".equals(env.gitlabActionType)} }
+    stage ("DockerHub-Push") {
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
       steps {
         script {
-          triggerSlaveJob ('RAN-DockerHub-Push', 'Push-to-Docker-Hub')
+          triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
         }
       }
       post {
@@ -401,7 +408,6 @@ pipeline {
       script {
         def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
         if ("MERGE".equals(env.gitlabActionType)) {
-          echo "This is a MERGE event"
           addGitLabMRComment comment: message
         }
         echo "Pipeline is SUCCESSFUL"
@@ -411,7 +417,6 @@ pipeline {
       script {
         def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
         if ("MERGE".equals(env.gitlabActionType)) {
-          echo "This is a MERGE event"
           addGitLabMRComment comment: message
         }
         echo "Pipeline FAILED"

ci-scripts/Jenkinsfile-gitlab

@@ -33,8 +33,9 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
 // Location of the executor node
 def nodeExecutor = params.nodeExecutor
 
-// VM Lockable resources
-def vmResource = params.vmLockableResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Tags to shorten pipeline duration
 def doMandatoryTests = false
@@ -81,7 +82,7 @@ pipeline {
                             message += "Not performing CI due to lack of labels"
                             addGitLabMRComment comment: message
                             error('Not performing CI due to lack of labels')
-                        } else if (LABEL_CHECK == 'FULL') {
+                        } else if (LABEL_CHECK == 'FULL' || LABEL_CHECK == 'SHORTEN-4G') {
                             doMandatoryTests = true
                             doFullTestsuite = true
                         } else if (LABEL_CHECK == 'SHORTEN-5G') {
@@ -138,7 +139,7 @@ pipeline {
 
         stage ("Start VM -- gnb-usrp") {
             steps {
-              lock (vmResource) {
+              lock (extra: lockResources) {
                 timeout (time: 5, unit: 'MINUTES') {
                     sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
                 }
@@ -148,7 +149,7 @@ pipeline {
 
         stage ("Start VM -- nr-ue-usrp") {
             steps {
-              lock (vmResource) {
+              lock (extra: lockResources) {
                 timeout (time: 5, unit: 'MINUTES') {
                     sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
                 }
@@ -158,7 +159,7 @@ pipeline {
 
         stage ("Start VM -- enb-ethernet") {
             steps {
-              lock (vmResource) {
+              lock (extra: lockResources) {
                 timeout (time: 7, unit: 'MINUTES') {
                     sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
                 }
@@ -168,7 +169,7 @@ pipeline {
 
         stage ("Start VM -- ue-ethernet") {
             steps {
-              lock (vmResource) {
+              lock (extra: lockResources) {
                 timeout (time: 7, unit: 'MINUTES') {
                     sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
                 }
@@ -208,7 +209,7 @@ pipeline {
                 stage ("Build UE-ethernet") {
                     steps {
                       // This is typically the last one to finish.
-                      lock (vmResource) {
+                      lock (extra: lockResources) {
                         gitlabCommitStatus(name: "Build UE-ethernet") {
                             timeout (time: 45, unit: 'MINUTES') {
                                 sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
@@ -269,7 +270,7 @@ pipeline {
                                 expression {doMandatoryTests}
                             }
                             steps {
-                              lock (vmResource) {
+                              lock (extra: lockResources) {
                                 script {
                                     timeout (time: 30, unit: 'MINUTES') {
                                         try {
@@ -289,7 +290,7 @@ pipeline {
                                 expression {doMandatoryTests}
                             }
                             steps {
-                              lock (vmResource) {
+                              lock (extra: lockResources) {
                                 script {
                                     timeout (time: 40, unit: 'MINUTES') {
                                         try {
@@ -309,7 +310,7 @@ pipeline {
                                 expression {doMandatoryTests}
                             }
                             steps {
-                              lock (vmResource) {
+                              lock (extra: lockResources) {
                                 script {
                                     timeout (time: 40, unit: 'MINUTES') {
                                         try {
@@ -329,7 +330,7 @@ pipeline {
                                 expression {doMandatoryTests}
                             }
                             steps {
-                              lock (vmResource) {
+                              lock (extra: lockResources) {
                                 sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
                               }
                             }

ci-scripts/Jenkinsfile-physim-deploy

@@ -32,7 +32,9 @@ def buildStageStatus = true
 def testStageName = params.pipelineTestStageName
 
 // Name of the resource
-def ciEpcResource = params.epcResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
@@ -56,7 +58,7 @@ pipeline {
     disableConcurrentBuilds()
     timestamps()
     ansiColor('xterm')
-    lock(ciEpcResource)
+    lock(lockResources)
   }
 
   stages {
@@ -80,7 +82,8 @@ pipeline {
             testStageName = 'Template Test Stage'
           }
 
-          if (params.smartphonesResource == null) {
+          if (params.LockResources == null) {
+            echo "no LockResources given"
             allParametersPresent = false
           }
           if (params.eNB_IPAddress == null) {

ci-scripts/Jenkinsfile-push-registry

@@ -23,8 +23,10 @@
 // Location of the python executor node shall be in the same subnet as the others servers
 def nodeExecutor = params.nodeExecutor
 
-// Name of the phone resource
-def ciServerResource = params.serverResource
+// Name of the resource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Docker Hub account to push to
 def DH_Account = "oaisoftwarealliance"
@@ -36,7 +38,7 @@ pipeline {
   options {
     disableConcurrentBuilds()
     ansiColor('xterm')
-    lock (ciServerResource)
+    lock(extra: lockResources)
   }
   stages {
     stage ("Verify Parameters") {
@@ -49,7 +51,8 @@ pipeline {
           if (params.nodeExecutor != null) {
             echo "Docker Push executor node  :   ${nodeExecutor}"
           }
-          if (params.serverResource == null) {
+          if (params.LockResources == null) {
+            echo "no LockResources given"
             allParametersPresent = false
           }
         }

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -33,11 +33,9 @@ def buildStageStatus = true
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
 
-// Name of the phone resource
-def ciSmartPhoneResource = params.smartphonesResource
-
-// Name of the phone resource
-def oaiUEResource = params.oaiUEResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Terminate Status
 def termENB = 0
@@ -65,7 +63,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock(extra: [[resource: oaiUEResource]], resource: ciSmartPhoneResource)
+        lock(extra: lockResources)
     }
 
     stages {
@@ -85,11 +83,9 @@ pipeline {
                         testStageName = 'Template Test Stage'
                     }
 
-                    if (params.smartphonesResource == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.oaiUEResource == null) {
-                        allParametersPresent = false
+                    if (params.LockResources == null) {
+                      echo "no LockResources given"
+                      allParametersPresent = false
                     }
                     if (params.eNB_IPAddress == null) {
                         allParametersPresent = false

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -33,11 +33,9 @@ def buildStageStatus = true
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
 
-// Name of the phone resource
-def ciSmartPhoneResource = params.smartphonesResource
-
-// Name of the phone resource
-def ciEpcResource = params.epcResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
@@ -54,7 +52,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock(extra: [[resource: ciEpcResource]], resource: ciSmartPhoneResource)
+        lock(extra: lockResources)
     }
     stages {
         stage ("Verify Parameters") {
@@ -73,8 +71,9 @@ pipeline {
                         testStageName = 'Template Test Stage'
                     }
 
-                    if (params.smartphonesResource == null) {
-                        allParametersPresent = false
+                    if (params.LockResources == null) {
+                      echo "no LockResources given"
+                      allParametersPresent = false
                     }
                     // 1st eNB parameters
                     if (params.eNB_IPAddress == null) {

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -34,10 +34,9 @@ def buildStageStatus = true
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
 
-// Name of the phone/server resource
-def ciSmartPhonesResource1 = params.SmartPhonesResource1
-def ciSmartPhonesResource2 = params.SmartPhonesResource2
-def ciSmartPhonesResource3 = params.SmartPhonesResource3
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
@@ -56,7 +55,7 @@ pipeline {
   options {
     disableConcurrentBuilds()
     ansiColor('xterm')
-    lock(extra: [[resource: ciSmartPhonesResource2],[resource: ciSmartPhonesResource1]],resource: ciSmartPhonesResource3)
+    lock(extra: lockResources)
   }
   stages {
     stage("Build Init") {
@@ -82,15 +81,10 @@ pipeline {
             testStageName = 'Template Test Stage'
           }
 
-          if (params.SmartPhonesResource1 == null) {
+          if (params.LockResources == null) {
+            echo "no LockResources given"
             allParametersPresent = false
           }
-          if (params.SmartPhonesResource2 == null) {
-            allParametersPresent = false
-          }
-          if (params.SmartPhonesResource3 == null) {
-            allParametersPresent = false
-          }          
           // 1st eNB parameters
           if (params.eNB_IPAddress == null) {
             allParametersPresent = false

ci-scripts/Jenkinsfile-tmp-ran

@@ -33,11 +33,9 @@ def buildStageStatus = true
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
 
-// Name of the phone resource
-def ciSmartPhoneResource = params.smartphonesResource
-
-// Name of the phone resource
-def ciEpcResource = params.epcResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Terminate Status
 def termUE = 0
@@ -67,7 +65,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock(extra: [[resource: ciEpcResource]], resource: ciSmartPhoneResource)
+        lock(extra: lockResources)
     }
     // the following parameter options are commented out so it shows the ones
     // that you SHALL have to run the job.
@@ -79,7 +77,7 @@ pipeline {
         string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
         string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
         booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
-        string(name: 'smartphonesResource', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
+        string(name: 'lockResources', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
 
         //eNB parameters
         string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
@@ -115,8 +113,9 @@ pipeline {
                         testStageName = 'Template Test Stage'
                     }
 
-                    if (params.smartphonesResource == null) {
-                        allParametersPresent = false
+                    if (params.LockResources == null) {
+                      echo "no LockResources given"
+                      allParametersPresent = false
                     }
                     if (params.eNB_IPAddress == null) {
                         allParametersPresent = false

ci-scripts/Jenkinsfile-tmp-ue

@@ -33,8 +33,9 @@ def buildStageStatus = true
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
 
-// Name of the phone resource
-def ciSmartPhoneResource = params.smartphonesResource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
 
 // Terminate Status
 def termUE = 0
@@ -64,7 +65,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock (ciSmartPhoneResource)
+        lock(extra: lockResources)
     }
     stages {
         stage ("Verify Parameters") {
@@ -83,8 +84,9 @@ pipeline {
                         testStageName = 'Template Test Stage'
                     }
 
-                    if (params.smartphonesResource == null) {
-                        allParametersPresent = false
+                    if (params.LockResources == null) {
+                      echo "no LockResources given"
+                      allParametersPresent = false
                     }
                     if (params.UE_IPAddress == null) {
                         allParametersPresent = false

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -73,36 +73,50 @@ done
 
 LABELS=`curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/$MERGE_REQUEST_ID" | jq '.labels' || true`
 
-IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY || true`
-IS_MR_CI=`echo $LABELS | grep -c CI || true`
-IS_MR_4G=`echo $LABELS | grep -c 4G-LTE || true`
-IS_MR_5G=`echo $LABELS | grep -c 5G-NR || true`
+IS_MR_DOCUMENTATION=`echo $LABELS | grep -ic documentation`
+IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY`
+IS_MR_CI=`echo $LABELS | grep -c CI`
+IS_MR_4G=`echo $LABELS | grep -c 4G-LTE`
+IS_MR_5G=`echo $LABELS | grep -c 5G-NR`
 
-# First case: none is present! No CI
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ]
+# none is present! No CI
+if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ]
 then
     echo "NONE"
     exit 0
 fi
 
-# Second case: Build-Only
-if [ $IS_MR_BUILD_ONLY -eq 1 ]
+# 4G and 5G or CI labels: run everything (4G, 5G)
+if [ $IS_MR_4G -eq 1 ] && [ $IS_MR_5G -eq 1 ] || [ $IS_MR_CI -eq 1 ]
 then
-    echo "BUILD-ONLY"
+    echo "FULL"
     exit 0
 fi
 
-# Third case: CI or 4G label --> Full CI run
-if [ $IS_MR_4G -eq 1 ] || [ $IS_MR_CI -eq 1 ] 
+# 4G is present: run only 4G
+if [ $IS_MR_4G -eq 1 ]
 then
-    echo "FULL"
-    exit 0
+    echo "SHORTEN-4G"
+    exit 1
 fi
 
-# Fourth case: 5G label
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 1 ]
+# 5G is present: run only 5G
+if [ $IS_MR_5G -eq 1 ]
 then
     echo "SHORTEN-5G"
     exit 0
 fi
 
+# BUILD-ONLY is present: only build stages
+if [ $IS_MR_BUILD_ONLY -eq 1 ]
+then
+    echo "BUILD-ONLY"
+    exit 0
+fi
+
+# Documentation is present: don't do anything
+if [ $IS_MR_DOCUMENTATION -eq 1 ]
+then
+    echo "documentation"
+    exit 1
+fi

doc/TESTBenches.md

@@ -18,10 +18,10 @@
 | idefix        | 172.21.16.135   | CI-NSA-MiniBench      | Quectel            | Quectel module                                        |
 | amariue       | 172.21.16.144   | CI-Amarisoft-UE-Usage | nrUE               | Amarisoft UE simulator                                |
 | bellatrix     | 192.168.117.115 | CI-RAN-VM-Deployment  | Executor           | --                                                    |
-| nano          | 192.168.12.62   | CI-Bench-1-Phones     | EPC, adb           | 2x COTS (adb)                                         |
-| hutch         | 192.168.12.19   | CI-Bench-1-Phones     | eNB (B7)           | B200mini (30C5239)                                    |
-| starsky       | 192.168.12.18   | CI-Bench-1-Phones     | eNB (B40)          | b200mini (30A3E3C)                                    |
-| carabe        | 192.168.12.211  | CI-Bench-2-OAI-Phone  | UE (B7UE)          | B200mini (30AE8C9)                                    |
+| nano          | 172.21.18.48    | CI-Bench-1-Phones     | EPC, adb           | 2x COTS (adb)                                         |
+| hutch         | 172.21.18.46    | CI-Bench-1-Phones     | eNB (B7)           | B200mini (30C5239)                                    |
+| starsky       | 172.21.18.45    | CI-Bench-1-Phones     | eNB (B40)          | b200mini (30A3E3C)                                    |
+| carabe        | 172.21.18.47    | CI-Bench-2-OAI-Phone  | UE (B7UE)          | B200mini (30AE8C9)                                    |
 
 Note: The available resources, and their current usage, is indicated here:
 - [Lockable resources of jenkins-oai](https://jenkins-oai.eurecom.fr/lockable-resources/):
@@ -97,7 +97,8 @@ Webhook
   - obelix + B200, nepes + B200, idefix + Quectel, porcepix w/ sabox
   - basic SA test (40 MHz TDD)
 - [RAN-PhySim-Cluster](https://jenkins-oai.eurecom.fr/job/RAN-PhySim-Cluster/)
-  - asterix (`Asterix-OC-oaicicd-session` resource), tests in OpenShift Cluster
+  - poseidon (jumphost, `Asterix-OC-oaicicd-session` resource), tests in
+    OpenShift Cluster
   - unitary simulators (`nr_dlsim`, etc.)
 - [RAN-RF-Sim-Test-4G](https://jenkins-oai.eurecom.fr/job/RAN-RF-Sim-Test-4G/)
   - obelix (eNB, 1x UE, OAI EPC)
@@ -106,8 +107,8 @@ Webhook
   - obelix (gNB, 2x UE, OAI 5GC)
   - uses RFsimulator, TDD 40MHz, FDD 40MHz, F1 split
 - [RAN-RHEL8-Cluster-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/)
-  - asterix (`Asterix-OC-oaicicd-session` resource): RHEL 8 image build using
-    the OpenShift in Eurecom
+  - poseidon (jumphost, `Asterix-OC-oaicicd-session` resource): RHEL 8 image
+    build using the OpenShift Cluster
 - [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
   - obelix: Ubuntu 18 image build using docker
 
@@ -144,10 +145,6 @@ runs tests:
 - bellatrix: runs 4G/5G simulators directly (eNB + 1x UE + (opt.) OAI EPC, gNB + 1x UE in "noS1")
 
 triggers pipelines:
-- [eNB-CI-F1-FDD-Band7-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-F1-FDD-Band7-B210/)
-  - hutch + B210, nano w/ ltebox + 2x UE
-  - tests 4G FDD with F1 split, 5MHz, 10MHz, 20MHz. 5MHz stable, rest known to
-    be unstable
 - [eNB-CI-FDD-Band7-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-FDD-Band7-B210/)
   - hutch + B210, nano w/ ltebox + 2x UE
   - tests T tracer, information through FlexRAN, RRC inactivity timers,