Merge branch 'develop_integration_2019_w11' of...

Merge branch 'develop_integration_2019_w11' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop_integration_2019_w11

ci-scripts/Jenkinsfile-gitlab

@@ -33,15 +33,18 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
 def doRedHatBuild = false
 def doFlexranCtrlTest = false
 
+// Location of the executor node
+def nodeExecutor = params.nodeExecutor
+
 pipeline {
     agent {
-        label 'bellatrix'
+        label nodeExecutor
     }
     options {
         disableConcurrentBuilds()
         timestamps()
         gitLabConnection('OAI GitLab')
-        gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-FDD-Band7", "Test-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40"])
+        gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13"])
         ansiColor('xterm')
     }
 
@@ -393,7 +396,7 @@ pipeline {
                     steps {
                         script {
                             if ("MERGE".equals(env.gitlabActionType)) {
-                                gitlabCommitStatus(name: "Test-FDD-Band7") {
+                                gitlabCommitStatus(name: "Test-Mono-FDD-Band7") {
                                     build job: 'eNB-CI-FDD-Band7-B210',
                                        parameters: [
                                            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
@@ -404,7 +407,7 @@ pipeline {
                                        ]
                                 }
                             } else {
-                                gitlabCommitStatus(name: "Test-FDD-Band7") {
+                                gitlabCommitStatus(name: "Test-Mono-FDD-Band7") {
                                     build job: 'eNB-CI-FDD-Band7-B210',
                                        parameters: [
                                            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
@@ -444,7 +447,7 @@ pipeline {
                     steps {
                         script {
                             if ("MERGE".equals(env.gitlabActionType)) {
-                                gitlabCommitStatus(name: "Test-TDD-Band40") {
+                                gitlabCommitStatus(name: "Test-Mono-TDD-Band40") {
                                     build job: 'eNB-CI-TDD-Band40-B210',
                                        parameters: [
                                            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
@@ -455,7 +458,7 @@ pipeline {
                                        ]
                                 }
                             } else {
-                                gitlabCommitStatus(name: "Test-TDD-Band40") {
+                                gitlabCommitStatus(name: "Test-Mono-TDD-Band40") {
                                     build job: 'eNB-CI-TDD-Band40-B210',
                                        parameters: [
                                            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
@@ -593,6 +596,57 @@ pipeline {
                         }
                     }
                 }
+                stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
+                    steps {
+                        script {
+                            if ("MERGE".equals(env.gitlabActionType)) {
+                                gitlabCommitStatus(name: "Test-Mono-FDD-Band13") {
+                                    build job: 'eNB-CI-MONO-FDD-Band13-B210',
+                                       parameters: [
+                                           string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+                                           string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+                                           string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+                                           booleanParam(name: 'eNB_mergeRequest', value: true),
+                                           string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+                                       ]
+                                }
+                            } else {
+                                gitlabCommitStatus(name: "Test-Mono-FDD-Band13") {
+                                    build job: 'eNB-CI-MONO-FDD-Band13-B210',
+                                       parameters: [
+                                           string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+                                           string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
+                                           string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
+                                           booleanParam(name: 'eNB_mergeRequest', value: false)
+                                       ]
+                                }
+                            }
+                        }
+                    }
+                    post {
+                        // In case of any non-success, we are retrieving the HTML report of the last completed
+                        // slave job.
+                        // The only drop-back is that we may retrieve the HTML report of a previous build
+                        always {
+                            script {
+                                if (!fileExists('test_results-eNB-CI-MONO-FDD-Band13-B210.html')) {
+                                    copyArtifacts(projectName: 'eNB-CI-MONO-FDD-Band13-B210',
+                                                  filter: 'test_results*.html',
+                                                  selector: lastCompleted())
+                                    if (fileExists('test_results-eNB-CI-MONO-FDD-Band13-B210.html')) {
+                                        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-MONO-FDD-Band13-B210.html"
+                                        archiveArtifacts artifacts: 'test_results-eNB-CI-MONO-FDD-Band13-B210.html'
+                                    }
+                                }
+                            }
+                        }
+                        failure {
+                            script {
+                                currentBuild.result = 'FAILURE'
+                            }
+                        }
+                    }
+                }
             }
             post {
                 always {

openair1/PHY/LTE_TRANSPORT/edci.c

@@ -117,7 +117,6 @@ void init_mpdcch5ss1tab_normal_regular_subframe_evenNRBDL(PHY_VARS_eNB * eNB)
       if (((l != 5) && (l != 6) && (l != 12) && (l != 13)) || (kmod == 2) || (kmod == 3) || (kmod == 4) || (kmod == 7) || (kmod == 8) || (kmod == 9)) {
 	mpdcch5ss1tab[re] = (l * eNB->frame_parms.ofdm_symbol_size) + k;
 	re++;
-	printf("l %d, k %d (kmod %d) => re %d\n", l, k, kmod, re);
       } else if ((kmod == 0) || (kmod == 5) || (kmod == 10)) {
 	mpdcch5ss1tab[re++] = (l * eNB->frame_parms.ofdm_symbol_size) + k;
       }