Merge remote-tracking branch 'origin/develop' into simde

integration_2022_wk37

See merge request oai/openairinterface5g!1710

MR !1695 fix bug added in MR1609 improve-nr_ul_channel_estimation branch
MR !1704 remove target/SCRIPTS
MR !1708 Repair cluster-build pipeline

.clang-format

@@ -0,0 +1,107 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: After
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     200
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        1
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth:        2
+UseTab:          Never
+...
+

NOTICE.md

@@ -21,7 +21,6 @@ The Regents of the University of California: BSD 3-Clause Licence.
 
 Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
 
-## Credits for source code openair3/GTPV1-U/nw-gtpv1u: ##
-
-Amit Chawre <http://www.amitchawre.net/contact.html>: BSD 2-Clause Licence.
+## Credits for source code openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c and nrLDPC_offload.h: ##
 
+Intel Corporation SPDX-License-Identifier: BSD-3-Clause Licence

ci-scripts/Jenkinsfile-GitLab-Container

@@ -136,16 +136,16 @@ pipeline {
             }
           }
         }
-        stage ("RHEL8 Build") {
+        stage ("RHEL8-Cluster-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-RHEL8-Image-Builder', 'RHEL8-Images-Build')
+              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL8-Cluster-Image-Builder')
             }
           }
           post {
             always {
               script {
-                finalizeSlaveJob('RAN-RHEL8-Image-Builder')
+                finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
               }
             }
             failure {
@@ -238,6 +238,26 @@ pipeline {
             }
           }
         }
+        stage ("4G L2 Simulators") {
+          when { expression {doMandatoryTests} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'Test-L2-Sim-Container-4G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
         stage ("5G L2 Simulators") {
           when { expression {doMandatoryTests} }
           steps {
@@ -318,6 +338,27 @@ pipeline {
             }
           }
         }
+        //avra is offline, re-enable once it is available
+        //stage ("Test T1 Offload") {
+        //  when { expression {doMandatoryTests} }
+        //  steps {
+        //    script {
+        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'Test-T1-Offload')
+        //    }
+        //  }
+        //  post {
+        //    always {
+        //      script {
+        //        finalizeSlaveJob('RAN-T1-Offload-Test')
+        //      }
+        //    }
+        //    failure {
+        //      script {
+        //        currentBuild.result = 'FAILURE'
+        //      }
+        //    }
+        //  }
+        //}
       }
     }
     stage ("Images Push to Registries") {

ci-scripts/Jenkinsfile-cluster

@@ -0,0 +1,254 @@
+#!/bin/groovy
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+// Location of the executor node
+def pythonExecutor = params.pythonExecutor
+
+// Location of the test XML file to be run
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+
+// Name of the test stage
+def testStageName = params.pipelineTestStageName
+
+// Name of the resource
+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
+def eNB_Repository
+def eNB_Branch
+def eNB_CommitID
+def eNB_AllowMergeRequestProcess = false
+def eNB_TargetBranch
+
+def directoryExistsGlob(fileNameWithGlob) {
+  /* if multiple directories match, will join their names and call fileExists() on that */
+  def dir = sh returnStdout: true, script: 'find . -name \'' + fileNameWithGlob + '\' -type d'
+  dir = dir.replaceAll("\n", "").trim()
+  echo "matching '" + fileNameWithGlob + "' found: '"  + dir + "'"
+  if (dir == "")
+    return false
+  return fileExists(dir)
+}
+
+//-------------------------------------------------------------------------------
+// Pipeline start
+pipeline {
+  agent {
+    label pythonExecutor
+  }
+  options {
+    disableConcurrentBuilds()
+    timestamps()
+    ansiColor('xterm')
+    lock(extra: lockResources)
+  }
+
+  stages {
+    stage ('Verify Parameters') {
+      steps {
+        script {
+          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
+
+          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
+          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
+
+          def allParametersPresent = true
+
+          // It is already to late to check it
+          if (params.pythonExecutor != null) {
+            echo "eNB CI executor node  :   ${pythonExecutor}"
+          }
+          // If not present picking a default Stage Name
+          if (params.pipelineTestStageName == null) {
+            // picking default
+            testStageName = 'Template Test Stage'
+          }
+
+          if (params.LockResources == null) {
+            echo "no LockResources given"
+            allParametersPresent = false
+          }
+          if (params.eNB_IPAddress == null) {
+            echo "no eNB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.eNB_Credentials == null) {
+            echo "no eNB_Credentials given"
+            allParametersPresent = false
+          }
+          // the following 4 parameters should be pushed by the master trigger
+          // if not present, take the job GIT variables (used for developing)
+          if (params.eNB_Repository == null) {
+            eNB_Repository = env.GIT_URL
+          } else {
+            eNB_Repository = params.eNB_Repository
+          }
+          echo "eNB_Repository        :   ${eNB_Repository}"
+          if (params.eNB_Branch == null) {
+            eNB_Branch = env.GIT_BRANCH
+          } else {
+            eNB_Branch = params.eNB_Branch
+          }
+          echo "eNB_Branch            :   ${eNB_Branch}"
+          if (params.eNB_CommitID == null) {
+            eNB_CommitID = env.GIT_COMMIT
+          } else {
+            eNB_CommitID = params.eNB_CommitID
+          }
+          echo "eNB_CommitID          :   ${eNB_CommitID}"
+          if (params.eNB_mergeRequest != null) {
+            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
+            if (eNB_AllowMergeRequestProcess) {
+              if (params.eNB_TargetBranch != null) {
+                eNB_TargetBranch = params.eNB_TargetBranch
+              } else {
+                eNB_TargetBranch = 'develop'
+              }
+              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
+            }
+          } else {
+            echo "no eNB_mergeRequest given - not merging develop"
+          }
+
+          if (params.EPC_IPAddress == null) {
+            echo "no EPC_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            echo "no EPC_Type given"
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            echo "no EPC_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            echo "no EPC_Credentials given"
+            allParametersPresent = false
+          }
+
+          if (params.ADB_IPAddress == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.ADB_Credentials == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.OC_Credentials == null) {
+            echo "no OC_Credentials given"
+            allParametersPresent = false
+          }
+          if (params.OC_ProjectName == null) {
+            echo "no OC_ProjectName given"
+            allParametersPresent = false
+          }
+          if (params.pythonTestXmlFile == null) {
+            echo "no pythonTestXmlFile given"
+            allParametersPresent = false
+          }
+          if (allParametersPresent) {
+            echo "All parameters are present"
+            if (eNB_AllowMergeRequestProcess) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${eNB_CommitID}"
+            }
+          } else {
+            echo "Some parameters are missing"
+            sh "./ci-scripts/fail.sh"
+          }
+        }
+      }
+    }
+
+    stage ("Deploy and Test") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+            for (xmlFile in myXmlTestSuite) {
+              if (fileExists(xmlFile)) {
+                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                echo "Test XML file         :   ${xmlFile}"
+              }
+            }
+            withCredentials([
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
+            ]) {
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+              for (xmlFile in myXmlTestSuite) {
+                if (fileExists(xmlFile)) {
+                  try {
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                  } catch (Exception e) {
+                    currentBuild.result = 'FAILURE'
+                    buildStageStatus = false
+                  }
+                }
+              }
+              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+            }
+          }
+        }
+      }
+    }
+    stage ("Log Collection") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            if (directoryExistsGlob("build_log_*")) {
+              sh "zip -r -qq build_log_${env.BUILD_ID}.zip build_log_*/*"
+              sh "rm -rf build_log_*/"
+              archiveArtifacts artifacts: "build_log_${env.BUILD_ID}.zip"
+            }
+            if (directoryExistsGlob("test_log_*")) {
+              sh "zip -r -qq test_log_${env.BUILD_ID}.zip test_log_*/*"
+              sh "rm -rf test_log_*/"
+              archiveArtifacts artifacts: "test_log_${env.BUILD_ID}.zip"
+            }
+            if (fileExists("test_results.html")) {
+              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
+              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
+              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
+            }
+          }
+        }
+      }
+    }
+  }
+}

ci-scripts/Jenkinsfile-gitlab

@@ -111,17 +111,7 @@ pipeline {
                         sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
                         sh "zip -r -qq localZip.zip ."
 
-                        // Running astyle options on the list of modified files by the merge request
-                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
-                        sh "./ci-scripts/checkCodingFormattingRules.sh --src-branch ${env.gitlabSourceBranch} --target-branch ${env.gitlabTargetBranch}"
-                        def res=readFile('./oai_rules_result.txt').trim();
-                        if ("0".equals(res)) {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): All Changed files in Merge Request follow OAI Formatting Rules"
-                            addGitLabMRComment comment: message
-                        } else {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Some Changed files in Merge Request DO NOT follow OAI Formatting Rules"
-                            addGitLabMRComment comment: message
-                        }
+                        // here was an astyle formatting check, with corresponding messages. The same could be done with clang-format
                     } else {
                         echo "Git Branch      is ${GIT_BRANCH}"
                         echo "Git Commit      is ${GIT_COMMIT}"
@@ -132,9 +122,6 @@ pipeline {
                         sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
 
                         sh "zip -r -qq localZip.zip ."
-                        // Running astyle options on all C/H files in the repository
-                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
-                        sh "./ci-scripts/checkCodingFormattingRules.sh"
                     }
                 }
             }
@@ -187,7 +174,7 @@ pipeline {
                 }
               }
             }
-   }
+        }
         
         stage ("Variant Builds") {
             parallel {
@@ -349,165 +336,6 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-TDD-Band40-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test IF4p5 - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-IF4p5-FDD-Band7-B210', 'Test-IF4p5-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-IF4p5-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test F1 - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-F1-FDD-Band7-B210', 'Test-F1-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-F1-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test IF4p5 - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band40-B210', 'Test-IF4p5-TDD-Band40')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-IF4p5-TDD-Band40-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test OAI UE - FDD - Band 20 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('UE-CI-FDD-Band20-B200')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test OAI UE - OAI eNB - FDD - Band 7 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            // Delayed trigger on slave job, so it is always the last one to run
-                            sh "sleep 240"
-                            triggerSlaveJob ('eNB-UE-CI-MONO-FDD-Band7-B200', 'Test-eNB-OAI-UE-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-UE-CI-MONO-FDD-Band7-B200')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
             }
             post {
                 always {
@@ -583,68 +411,3 @@ OAI CI Team''',
         }
     }
 }
-
-// ----  Slave Job functions
-
-def triggerSlaveJob (jobName, gitlabStatusName) {
-    // Workaround for the "cancelled" GitLab pipeline notification
-    // The slave job is triggered with the propagate false so the following commands are executed
-    // Its status is now PASS/SUCCESS from a stage pipeline point of view
-    // localStatus variable MUST be analyzed to properly assess the status
-    localStatus = build job: jobName,
-        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: "MERGE".equals(env.gitlabActionType)),
-            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-        ], propagate: false
-    localResult = localStatus.getResult()
-    echo "${jobName} Slave Job status is ${localResult}"
-    gitlabCommitStatus(name: gitlabStatusName) {
-        if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-           echo "${jobName} Slave Job is OK"
-        } else {
-           echo "${jobName} Slave Job is KO"
-           sh "ci-scripts/fail.sh"
-        }
-    }
-}
-
-def triggerSlaveJobNoGitLab (jobName) {
-    // Workaround for the "cancelled" GitLab pipeline notification
-    // The slave job is triggered with the propagate false so the following commands are executed
-    // Its status is now PASS/SUCCESS from a stage pipeline point of view
-    // localStatus variable MUST be analyzed to properly assess the status
-    localStatus = build job: jobName,
-        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: "MERGE".equals(env.gitlabActionType)),
-            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-        ], propagate: false
-    localResult = localStatus.getResult()
-    echo "${jobName} Slave Job status is ${localResult}"
-    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-       echo "${jobName} Slave Job is OK"
-    } else {
-       echo "${jobName} Slave Job is KO"
-       sh "ci-scripts/fail.sh"
-    }
-}
-
-def finalizeSlaveJob(jobName) {
-    // 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
-    fileName = "test_results-${jobName}.html"
-    if (!fileExists(fileName)) {
-        copyArtifacts(projectName: jobName,
-            filter: 'test_results*.html',
-            selector: lastCompleted())
-        if (fileExists(fileName)) {
-            sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
-            archiveArtifacts artifacts: fileName
-        }
-    }
-}

ci-scripts/args_parse.py

@@ -41,7 +41,7 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
 
 
     py_param_file_present = False
@@ -82,6 +82,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
             CONTAINERS.ranRepository=matchReg.group(1)
             SCA.ranRepository=matchReg.group(1)
             PHYSIM.ranRepository=matchReg.group(1)
+            CLUSTER.ranRepository=matchReg.group(1)
         elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
@@ -96,6 +97,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                 CONTAINERS.ranAllowMerge=True
                 SCA.ranAllowMerge=True
                 PHYSIM.ranAllowMerge=True
+                CLUSTER.ranAllowMerge=True
         elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
@@ -108,6 +110,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
             CONTAINERS.ranBranch=matchReg.group(1)
             SCA.ranBranch=matchReg.group(1)
             PHYSIM.ranBranch=matchReg.group(1)
+            CLUSTER.ranBranch=matchReg.group(1)
         elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
@@ -120,6 +123,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
             CONTAINERS.ranCommitID=matchReg.group(1)
             SCA.ranCommitID=matchReg.group(1)
             PHYSIM.ranCommitID=matchReg.group(1)
+            CLUSTER.ranCommitID=matchReg.group(1)
         elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
@@ -132,6 +136,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
             CONTAINERS.ranTargetBranch=matchReg.group(1)
             SCA.ranTargetBranch=matchReg.group(1)
             PHYSIM.ranTargetBranch=matchReg.group(1)
+            CLUSTER.ranTargetBranch=matchReg.group(1)
         elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
@@ -140,6 +145,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                 CONTAINERS.eNBIPAddress=matchReg.group(1)
                 SCA.eNBIPAddress=matchReg.group(1)
                 PHYSIM.eNBIPAddress=matchReg.group(1)
+                CLUSTER.eNBIPAddress=matchReg.group(1)
             elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1IPAddress=matchReg.group(1)
@@ -156,6 +162,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                 CONTAINERS.eNBUserName=matchReg.group(1)
                 SCA.eNBUserName=matchReg.group(1)
                 PHYSIM.eNBUserName=matchReg.group(1)
+                CLUSTER.eNBUserName=matchReg.group(1)
             elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1UserName=matchReg.group(1)
@@ -172,6 +179,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                 CONTAINERS.eNBPassword=matchReg.group(1)
                 SCA.eNBPassword=matchReg.group(1)
                 PHYSIM.eNBPassword=matchReg.group(1)
+                CLUSTER.eNBPassword=matchReg.group(1)
             elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1Password=matchReg.group(1)
@@ -188,6 +196,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                 CONTAINERS.eNBSourceCodePath=matchReg.group(1)
                 SCA.eNBSourceCodePath=matchReg.group(1)
                 PHYSIM.eNBSourceCodePath=matchReg.group(1)
+                CLUSTER.eNBSourceCodePath=matchReg.group(1)
             elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1SourceCodePath=matchReg.group(1)
@@ -260,12 +269,21 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
         elif re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCUserName = matchReg.group(1)
+            CLUSTER.OCUserName = matchReg.group(1)
         elif re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCPassword = matchReg.group(1)
+            CLUSTER.OCPassword = matchReg.group(1)
         elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCProjectName = matchReg.group(1)
+            CLUSTER.OCProjectName = matchReg.group(1)
+        elif re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
+            CLUSTER.OCUrl = matchReg.group(1)
+        elif re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
+            CLUSTER.OCRegistry = matchReg.group(1)
         elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
             RAN.BuildId = matchReg.group(1)

ci-scripts/astyle-options.txt

@@ -1,26 +0,0 @@
-# OAI is using a style that is similar to the Google style
---style=google
-# long options can be written without the preceding '--'
-# Convert tabs to spaces
-convert-tabs
-# Indentation is 2 spaces
-indent=spaces=2
-# Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block. 
-indent-switches
-# Indent preprocessor blocks at bracket level 0.
-indent-preproc-block
-# Indent multi-line preprocessor #define statements.
-indent-preproc-define
-# Indent C++ comments beginning in column one.
-indent-col1-comments
-# Pad empty lines around header blocks
-break-blocks
-delete-empty-lines
-# Attach a pointer or reference operator (*, &, or ^) to the variable name (right)
-align-pointer=name
-# The code line length is 200 characters/columns (this is the maximum allowed by astyle)
-max-code-length=200
-# If the line contains logical conditionals they will be placed first on the new line.
-break-after-logical
-# Force use of the linux end of line
-lineend=linux

ci-scripts/checkCodingFormattingRules.sh

@@ -24,8 +24,6 @@ function usage {
     echo "OAI Coding / Formatting Guideline Check script"
     echo "   Original Author: Raphael Defosseux"
     echo ""
-    echo "   Requirement: astyle shall be installed"
-    echo ""
     echo "   By default (no options) the complete repository will be checked"
     echo "   In case of merge request, provided source and target branch,"
     echo "   the script will check only the modified files"
@@ -57,11 +55,10 @@ fi
 
 if [ $# -eq 0 ]
 then
-    echo " ---- Checking the whole repository ----"
-    echo ""
-    NB_FILES_TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt --recursive --exclude=ci-scripts --exclude=cmake_targets *.c *.h | grep -c Formatted || true`
-    echo "Nb Files that do NOT follow OAI rules: $NB_FILES_TO_FORMAT"
-    echo $NB_FILES_TO_FORMAT > ./oai_rules_result.txt
+    # in this file we previously had a list of files that were not properly
+    # formatted. At the time of this MR, the Jenkinsfile expects this file, so
+    # we simply produce an empty one
+    touch ./oai_rules_result.txt
 
     # Testing Circular Dependencies protection
     awk '/#[ \t]*ifndef/ { gsub("^.*ifndef *",""); if (names[$1]!="") print "files with same {define ", FILENAME, names[$1]; names[$1]=FILENAME } /#[ \t]*define/ { gsub("^.*define *",""); if(names[$1]!=FILENAME) print "error in declaration", FILENAME, $1, names[$1]; nextfile }' `find openair* common targets executables -name *.h |grep -v LFDS` > header-files-w-incorrect-define.txt
@@ -77,7 +74,7 @@ then
        IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
        IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
        IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
-       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc|openair1/PHY/CODING/types.h" || true`
+       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
        if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
        then
            if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -151,10 +148,6 @@ echo ""
 # Retrieve the list of modified files since the latest develop commit
 MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_TO_FORMAT=0
-if [ -f oai_rules_result_list.txt ]
-then
-    rm -f oai_rules_result_list.txt
-fi
 if [ -f header-files-w-incorrect-define.txt ]
 then
     rm -f header-files-w-incorrect-define.txt
@@ -178,13 +171,6 @@ do
     EXT="${filename##*.}"
     if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
     then
-        TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt $FULLFILE | grep -c Formatted || true`
-        NB_TO_FORMAT=$((NB_TO_FORMAT + TO_FORMAT))
-        if [ $TO_FORMAT -ne 0 ]
-        then
-            echo $FULLFILE
-            echo $FULLFILE >> ./oai_rules_result_list.txt
-        fi
         # Testing if explicit GNU GPL license banner
         GNU_EXCEPTION=`echo $FULLFILE | egrep -c "openair3/NAS/COMMON/milenage.h" || true`
         if [ $GNU_EXCEPTION -eq 0 ]
@@ -198,7 +184,7 @@ do
             IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
             IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
             IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc|openair1/PHY/CODING/types.h" || true`
+            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
             if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
             then
                 if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -215,9 +201,10 @@ do
     fi
 done
 rm -f header-files-w-incorrect-define-tmp.txt
-echo ""
-echo " ----------------------------------------------------------"
-echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT"
-echo $NB_TO_FORMAT > ./oai_rules_result.txt
+
+# in this script we previously produced a list of files that were not properly
+# formatted. At the time of this MR, the Jenkinsfile expects this file, so
+# we simply produce an empty file
+touch ./oai_rules_result.txt
 
 exit 0

ci-scripts/cls_cluster.py

@@ -0,0 +1,377 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import logging
+import sshconnection as SSH
+import cls_oai_html
+#import os
+import re
+import time
+#import subprocess
+import sys
+import constants as CONST
+import helpreadme as HELP
+import cls_containerize
+
+class Cluster:
+	def __init__(self):
+		self.eNBIPAddress = ""
+		self.eNBSourceCodePath = ""
+		self.forcedWorkspaceCleanup = False
+		self.OCUserName = ""
+		self.OCPassword = ""
+		self.OCProjectName = ""
+		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID = ""
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ""
+
+	def _recreate_entitlements(self, sshSession):
+		# recreating entitlements, don't care if deletion fails
+		sshSession.command('oc delete secret etc-pki-entitlement', '\$', 5)
+		if re.search(r"not found", sshSession.getBefore()):
+			logging.warning("no secrets etc-pki-entitlement found, recreating")
+		sshSession.command('ls /etc/pki/entitlement/???????????????????.pem | tail -1', '\$', 5, silent=True)
+		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", sshSession.getBefore())
+		sshSession.command('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', '\$', 5, silent=True)
+		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", sshSession.getBefore())
+		if regres1 is None or regres2 is None:
+			logging.error("could not find entitlements")
+			return false
+		file1 = regres1.group(0)
+		file2 = regres2.group(0)
+		sshSession.command(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}', '\$', 5)
+		regres = re.search(r"secret/etc-pki-entitlement created", sshSession.getBefore())
+		if regres is None:
+			logging.error("could not create secret/etc-pki-entitlement")
+			return False
+		return True
+
+	def _recreate_bc(self, sshSession, name, newTag, filename):
+		self._retag_image_statement(sshSession, name, name, newTag, filename)
+		sshSession.command(f'oc delete -f {filename}', '\$', 5)
+		sshSession.command(f'oc create -f {filename}', '\$', 5)
+		before = sshSession.getBefore()
+		if re.search('buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', before) is not None:
+			return True
+		logging.error('error while creating buildconfig: ' + sshSession.getBefore())
+		return False
+
+	def _recreate_is_tag(self, sshSession, name, newTag, filename):
+		sshSession.command(f'oc describe is {name}', '\$', 5)
+		if sshSession.getBefore().count('NotFound') > 0:
+			sshSession.command(f'oc create -f {filename}', '\$', 5)
+			before = sshSession.getBefore()
+			if re.search(f'imagestream.image.openshift.io/{name} created', before) is None:
+				logging.error('error while creating imagestream: ' + sshSession.getBefore())
+				return False
+		else:
+			logging.debug(f'-> imagestream {name} found')
+		image = f'{name}:{newTag}'
+		sshSession.command(f'oc delete istag {image}', '\$', 5) # we don't care if this fails, e.g., if it is missing
+		sshSession.command(f'oc create istag {image}', '\$', 5)
+		before = sshSession.getBefore()
+		if re.search(f'imagestreamtag.image.openshift.io/{image} created', before) is not None:
+			return True
+		logging.error('error while creating imagestreamtag: ' + sshSession.getBefore())
+		return False
+
+	def _start_build(self, sshSession, name):
+		# will return "immediately" but build runs in background
+		# if multiple builds are started at the same time, this can take some time, however
+		ret = sshSession.command(f'oc start-build {name} --from-file={self.eNBSourceCodePath}', '\$', 300)
+		before = sshSession.getBefore()
+		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', str(before))
+		if ret != 0 or before.count('Uploading finished') != 1 or regres is None:
+			logging.error("error during oc start-build: " + sshSession.getBefore())
+			self._delete_pod(sshSession, name)
+			return None
+		return regres.group('jobname') + '-build'
+
+	def _delete_pod(self, sshSession, shortName):
+		sshSession.command(f"oc get pods | grep {shortName}", '\$', 5)
+		regres = re.search(rf'{shortName}-[0-9]+-build', sshSession.getBefore())
+		if regres is not None:
+			sshSession.command(f"oc delete pod {regres.group(0)}", '\$', 5)
+		else:
+			logging.warning(f"no pod found with name {shortName}")
+
+	def _wait_build_end(self, sshSession, jobs, timeout_sec, check_interval_sec = 5):
+		logging.debug(f"waiting for jobs {jobs} to finish building")
+		while timeout_sec > 0:
+			# check status
+			for j in jobs:
+				sshSession.command(f'oc get pods | grep {j}', '\$', 10, silent = True)
+				if sshSession.getBefore().count('Completed') > 0: jobs.remove(j)
+				if sshSession.getBefore().count('Error') > 0:
+					logging.error(f'error for job {j}: ' + sshSession.getBefore())
+					return False
+			if jobs == []:
+				logging.debug('all jobs completed')
+				return True
+			time.sleep(check_interval_sec)
+			timeout_sec -= check_interval_sec
+		logging.error(f"timeout while waiting for end of build of {jobs}")
+		return False
+
+	def _retag_image_statement(self, sshSession, oldImage, newImage, newTag, filename):
+		sshSession.command(f'sed -i -e "s#{oldImage}:latest#{newImage}:{newTag}#" {filename}', '\$', 5)
+
+	def _get_image_size(self, sshSession, image, tag):
+		# get the SHA of the image we built using the image name and its tag
+		sshSession.command(f'oc describe is {image} | grep -A4 {tag}', '\$', 5)
+		result = re.search(f'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/(?P<imageSha>{image}@sha256:[a-f0-9]+)', sshSession.getBefore())
+		if result is None:
+			return -1
+		imageSha = result.group("imageSha")
+
+		# retrieve the size
+		sshSession.command(f'oc get -o json isimage {imageSha} | jq -Mc "{{dockerImageSize: .image.dockerImageMetadata.Size}}"', '\$', 5)
+		result = re.search('{"dockerImageSize":(?P<size>[0-9]+)}', str(sshSession.getBefore()))
+		if result is None:
+			return -1
+		return int(result.group("size"))
+
+	def _deploy_pod(self, sshSession, filename, timeout = 30):
+		sshSession.command(f'oc create -f {filename}', '\$', 10)
+		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', sshSession.getBefore())
+		if result is None:
+			logging.error(f'could not deploy pod: {sshSession.getBefore()}')
+			return None
+		pod = result.group("pod")
+		logging.debug(f'checking if pod {pod} is in Running state')
+		while timeout > 0:
+			sshSession.command(f'oc get pod {pod} -o json | jq -Mc .status.phase', '\$', 5, silent=True)
+			if re.search('"Running"', sshSession.getBefore()) is not None: return pod
+			timeout -= 1
+			time.sleep(1)
+		logging.error(f'pod {pod} did not reach Running state')
+		self._undeploy_pod(sshSession, filename)
+		return None
+
+	def _undeploy_pod(self, sshSession, filename):
+		# to save time we start this in the background and trust that oc stops correctly
+		sshSession.command(f'oc delete -f {filename} &', '\$', 5)
+
+	def BuildClusterImage(self, HTML):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+
+		lIpAddr = self.eNBIPAddress
+		lSourcePath = self.eNBSourceCodePath
+		if lIpAddr == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter: no SSH Credentials')
+		ocUserName = self.OCUserName
+		ocPassword = self.OCPassword
+		ocProjectName = self.OCProjectName
+		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter: no OC Credentials')
+		if self.OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /')
+
+		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, "oaicicd", "SHOULD NOT BE NECESSARY")
+
+		self.testCase_id = HTML.testCase_id
+
+		# Workaround for some servers, we need to erase completely the workspace
+		if self.forcedWorkspaceCleanup:
+			mySSH.command(f'rm -Rf {lSourcePath}', '\$', 15)
+		cls_containerize.CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
+		# we don't necessarily need a forced workspace cleanup, but in
+		# order to reduce the amount of data send to OpenShift, we
+		# manually delete all generated files in the workspace
+		mySSH.command(f'rm -rf {lSourcePath}/cmake_targets/ran_build', '\$', 30);
+
+		baseTag = 'develop'
+		forceBaseImageBuild = False
+		imageTag = 'develop'
+		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
+			imageTag = 'ci-temp'
+			if self.ranTargetBranch == 'develop':
+				mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX', '\$', 5)
+				result = re.search('index', mySSH.getBefore())
+				if result is not None:
+					forceBaseImageBuild = True
+					baseTag = 'ci-temp'
+		else:
+			forceBaseImageBuild = True
+
+		# logging to OC Cluster and then switch to corresponding project
+		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server {self.OCUrl}', '\$', 31)
+		if mySSH.getBefore().count('Login successful.') == 0:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			mySSH.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+
+		mySSH.command(f'oc project {ocProjectName}', '\$', 30)
+		if mySSH.getBefore().count(f'Already on project "{ocProjectName}"') == 0 and mySSH.getBefore().count(f'Now using project "{self.OCProjectName}"') == 0:
+			logging.error(f'\u001B[1mUnable to access OC project {ocProjectName}\u001B[0m')
+			mySSH.command('oc logout', '\$', 30)
+			mySSH.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
+			return False
+
+		self._recreate_entitlements(mySSH)
+
+		status = True # flag to abandon compiling if any image fails
+		attemptedImages = []
+		if forceBaseImageBuild:
+			self._recreate_is_tag(mySSH, 'ran-base', baseTag, 'openshift/ran-base-is.yaml')
+			self._recreate_bc(mySSH, 'ran-base', baseTag, 'openshift/ran-base-bc.yaml')
+			ranbase_job = self._start_build(mySSH, 'ran-base')
+			attemptedImages += ['ran-base']
+			status = ranbase_job is not None and self._wait_build_end(mySSH, [ranbase_job], 600)
+			if not status: logging.error('failure during build of ran-base')
+			mySSH.command(f'oc logs {ranbase_job} > cmake_targets/log/ran-base.log', '\$', 10)
+			# recover logs by mounting image
+			self._retag_image_statement(mySSH, 'ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
+			pod = self._deploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+			if pod is not None:
+				mySSH.command(f'mkdir -p cmake_targets/log/ran-base', '\$', 5)
+				mySSH.command(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base', '\$', 5)
+				self._undeploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+			else:
+				status = False
+
+		if status:
+			self._recreate_is_tag(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
+			self._recreate_bc(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
+			physim_job = self._start_build(mySSH, 'oai-physim')
+			attemptedImages += ['oai-physim']
+
+			self._recreate_is_tag(mySSH, 'ran-build', imageTag, 'openshift/ran-build-is.yaml')
+			self._recreate_bc(mySSH, 'ran-build', imageTag, 'openshift/ran-build-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
+			ranbuild_job = self._start_build(mySSH, 'ran-build')
+			attemptedImages += ['ran-build']
+
+			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end(mySSH, [ranbuild_job, physim_job], 1200)
+			if not wait: logging.error('error during build of ranbuild_job or physim_job')
+			status = status and wait
+			mySSH.command(f'oc logs {ranbuild_job} > cmake_targets/log/ran-build.log', '\$', 10)
+			mySSH.command(f'oc logs {physim_job} > cmake_targets/log/oai-physim.log', '\$', 10)
+
+		if status:
+			self._recreate_is_tag(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
+			self._recreate_bc(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
+			enb_job = self._start_build(mySSH, 'oai-enb')
+			attemptedImages += ['oai-enb']
+
+			self._recreate_is_tag(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
+			self._recreate_bc(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
+			gnb_job = self._start_build(mySSH, 'oai-gnb')
+			attemptedImages += ['oai-gnb']
+
+			self._recreate_is_tag(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
+			self._recreate_bc(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			lteue_job = self._start_build(mySSH, 'oai-lte-ue')
+			attemptedImages += ['oai-lte-ue']
+
+			self._recreate_is_tag(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
+			self._recreate_bc(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			nrue_job = self._start_build(mySSH, 'oai-nr-ue')
+			attemptedImages += ['oai-nr-ue']
+
+			wait = enb_job is not None and gnb_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end(mySSH, [enb_job, gnb_job, lteue_job, nrue_job], 600)
+			if not wait: logging.error('error during build of eNB/gNB/lteUE/nrUE')
+			status = status and wait
+			# recover logs
+			mySSH.command(f'oc logs {enb_job} > cmake_targets/log/oai-enb.log', '\$', 10)
+			mySSH.command(f'oc logs {gnb_job} > cmake_targets/log/oai-gnb.log', '\$', 10)
+			mySSH.command(f'oc logs {lteue_job} > cmake_targets/log/oai-lte-ue.log', '\$', 10)
+			mySSH.command(f'oc logs {nrue_job} > cmake_targets/log/oai-nr-ue.log', '\$', 10)
+
+		# split and analyze logs
+		imageSize = {}
+		for image in attemptedImages:
+			mySSH.command(f'mkdir -p cmake_targets/log/{image}', '\$', 5)
+			mySSH.command(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log', '\$', 5)
+			tag = imageTag if image != 'ran-base' else baseTag
+			size = self._get_image_size(mySSH, image, tag)
+			if size <= 0:
+				imageSize[image] = 'unknown -- BUILD FAILED'
+				status = False
+			else:
+				sizeMb = float(size) / 1000000
+				imageSize[image] = f'{sizeMb:.1f} Mbytes (uncompressed: ~{sizeMb*2.5:.1f} Mbytes)'
+			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
+
+		grep_exp = "\|".join(attemptedImages)
+		mySSH.command(f'oc get images | grep -e \'{grep_exp}\' > cmake_targets/log/image_registry.log', '\$', 10);
+
+		build_log_name = f'build_log_{self.testCase_id}'
+		cls_containerize.CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, 'oaicicd', CONST.CI_NO_PASSWORD)
+
+		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done', '\$', 60)
+
+		# logout will return eventually, but we don't care when -> start in background
+		mySSH.command('oc logout &', '\$', 5)
+		mySSH.close()
+
+		# Analyze the logs
+		collectInfo = cls_containerize.AnalyzeBuildLogs(build_log_name, attemptedImages, status)
+		for img in collectInfo:
+			for f in collectInfo[img]:
+				status = status and collectInfo[img][f]['status']
+		if not status:
+			logging.debug(collectInfo)
+
+		if status:
+			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'OK', CONST.ALL_PROCESSES_OK)
+		else:
+			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'KO', CONST.ALL_PROCESSES_OK)
+
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, imageSize)
+
+		return status

ci-scripts/cls_containerize.py

@@ -48,6 +48,107 @@ import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 
+#-----------------------------------------------------------
+# Helper functions used here and in other classes
+# (e.g., cls_cluster.py)
+#-----------------------------------------------------------
+def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
+	# on RedHat/CentOS .git extension is mandatory
+	result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', ranRepository)
+	if result is not None:
+		full_ran_repo_name = ranRepository.replace('git/', 'git')
+	else:
+		full_ran_repo_name = ranRepository + '.git'
+	sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
+	sshSession.command('cd ' + sourcePath, '\$', 5)
+	sshSession.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+	if sshSession.getBefore().count('done.') == 0:
+		logging.warning('did not find \'done.\' in git output while cloning/fetching, was not successful?')
+	sshSession.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+	sshSession.command('git config user.name "OAI Jenkins"', '\$', 5)
+
+	sshSession.command('git clean -x -d -ff', '\$', 30)
+	sshSession.command('mkdir -p cmake_targets/log', '\$', 5)
+	# if the commit ID is provided use it to point to it
+	if ranCommitID != '':
+		sshSession.command('git checkout -f ' + ranCommitID, '\$', 30)
+	# if the branch is not develop, then it is a merge request and we need to do
+	# the potential merge. Note that merge conflicts should already been checked earlier
+	if ranAllowMerge:
+		if ranTargetBranch == '':
+			sshSession.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+		else:
+			logging.debug('Merging with the target branch: ' + ranTargetBranch)
+			sshSession.command('git merge --ff origin/' + ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+
+def CopyLogsToExecutor(sshSession, sourcePath, log_name, scpIp, scpUser, scpPw):
+	sshSession.command(f'cd {sourcePath}/cmake_targets', '\$', 5)
+	sshSession.command(f'rm -f {log_name}.zip', '\$', 5)
+	sshSession.command(f'mkdir -p {log_name}', '\$', 5)
+	sshSession.command(f'mv log/* {log_name}', '\$', 5)
+	sshSession.command(f'zip -r -qq {log_name}.zip {log_name}', '\$', 5)
+
+	# copy zip to executor for analysis
+	if (os.path.isfile(f'./{log_name}.zip')):
+		os.remove(f'./{log_name}.zip')
+	if (os.path.isdir(f'./{log_name}')):
+		shutil.rmtree(f'./{log_name}')
+	sshSession.copyin(scpIp, scpUser, scpPw, f'{sourcePath}/cmake_targets/{log_name}.zip', '.')
+	sshSession.command(f'rm -f {log_name}.zip','\$', 5)
+	ZipFile(f'{log_name}.zip').extractall('.')
+
+def AnalyzeBuildLogs(buildRoot, images, globalStatus):
+	collectInfo = {}
+	for image in images:
+		files = {}
+		file_list = [f for f in os.listdir(f'{buildRoot}/{image}') if os.path.isfile(os.path.join(f'{buildRoot}/{image}', f)) and f.endswith('.txt')]
+		# Analyze the "sub-logs" of every target image
+		for fil in file_list:
+			errorandwarnings = {}
+			warningsNo = 0
+			errorsNo = 0
+			with open(f'{buildRoot}/{image}/{fil}', mode='r') as inputfile:
+				for line in inputfile:
+					result = re.search(' ERROR ', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' error:', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' WARNING ', str(line))
+					if result is not None:
+						warningsNo += 1
+					result = re.search(' warning:', str(line))
+					if result is not None:
+						warningsNo += 1
+				errorandwarnings['errors'] = errorsNo
+				errorandwarnings['warnings'] = warningsNo
+				errorandwarnings['status'] = globalStatus
+			files[fil] = errorandwarnings
+		# Analyze the target image
+		if os.path.isfile(f'{buildRoot}/{image}.log'):
+			errorandwarnings = {}
+			committed = False
+			tagged = False
+			with open(f'{buildRoot}/{image}.log', mode='r') as inputfile:
+				startOfTargetImageCreation = False # check for tagged/committed only after image created
+				for line in inputfile:
+					result = re.search(f'FROM .* [aA][sS] {image}$', str(line))
+					if result is not None:
+						startOfTargetImageCreation = True
+					if startOfTargetImageCreation:
+						lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
+						tagged = tagged or lineHasTag
+						# the OpenShift Cluster builder prepends image registry URL
+						lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
+						committed = committed or lineHasCommit
+			errorandwarnings['errors'] = 0 if committed or tagged else 1
+			errorandwarnings['warnings'] = 0
+			errorandwarnings['status'] = committed or tagged
+			files['Target Image Creation'] = errorandwarnings
+		collectInfo[image] = files
+	return collectInfo
+
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -91,8 +192,6 @@ class Containerize():
 		self.cliBuildOptions = ''
 		self.dockerfileprefix = ''
 		self.host = ''
-		self.allImagesSize = {}
-		self.collectInfo = {}
 
 		self.deployedContainers = []
 		self.tsharkStarted = False
@@ -115,35 +214,6 @@ class Containerize():
 # Container management functions
 #-----------------------------------------------------------
 
-	def _createWorkspace(self, sshSession, password, sourcePath):
-		# on RedHat/CentOS .git extension is mandatory
-		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
-		if result is not None:
-			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
-		else:
-			full_ran_repo_name = self.ranRepository + '.git'
-		sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
-		sshSession.command('cd ' + sourcePath, '\$', 5)
-		sshSession.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
-		# Raphael: here add a check if git clone or git fetch went smoothly
-		sshSession.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
-		sshSession.command('git config user.name "OAI Jenkins"', '\$', 5)
-
-		sshSession.command('echo ' + password + ' | sudo -S git clean -x -d -ff', '\$', 30)
-		sshSession.command('mkdir -p cmake_targets/log', '\$', 5)
-		# if the commit ID is provided use it to point to it
-		if self.ranCommitID != '':
-			sshSession.command('git checkout -f ' + self.ranCommitID, '\$', 30)
-		# if the branch is not develop, then it is a merge request and we need to do
-		# the potential merge. Note that merge conflicts should already been checked earlier
-		if (self.ranAllowMerge):
-			if self.ranTargetBranch == '':
-				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					sshSession.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
-			else:
-				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				sshSession.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
-
 	def BuildImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
@@ -211,13 +281,14 @@ class Containerize():
 	
 		self.testCase_id = HTML.testCase_id
 	
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 
  		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
-			mySSH.command('mkdir -p tmp/ca/ tmp/entitlement/', '\$', 5)
-			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5)
-			mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5)
+			mySSH.command('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca', '\$', 5)
+			mySSH.command('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf/', '\$', 5)
+			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/', '\$', 5)
+			mySSH.command('sudo cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/', '\$', 5)
 
 		baseImage = 'ran-base'
 		baseTag = 'develop'
@@ -246,32 +317,10 @@ class Containerize():
 		if forceBaseImageBuild:
 			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + baseImage + ' --tag ' + baseImage + ':' + baseTag + ' --file docker/Dockerfile.base' + self.dockerfileprefix + ' . > cmake_targets/log/ran-base.log 2>&1', '\$', 1600)
 		# First verify if the base image was properly created.
-		status = True
 		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + baseImage + ':' + baseTag, '\$', 5)
+		allImagesSize = {}
 		if mySSH.getBefore().count('o such image') != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
-			status = False
-		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-			if result is not None:
-				imageSize = float(result.group('size'))
-				imageSize = imageSize / 1000
-				if imageSize < 1000:
-					logging.debug('\u001B[1m   ran-base size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-					self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' kbytes'
-				else:
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ran-base size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-						self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' Mbytes'
-					else:
-						imageSize = imageSize / 1000
-						logging.debug('\u001B[1m   ran-base size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-						self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' Gbytes'
-			else:
-				logging.debug('ran-base size is unknown')
-		# If the base image failed, no need to continue
-		if not status:
 			# Recover the name of the failed container?
 			mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
 			mySSH.command(self.cli + ' image prune --force', '\$', 30)
@@ -281,20 +330,32 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			sys.exit(1)
 		else:
-			# Recover build logs, for the moment only possible when build is successful
-			mySSH.command(self.cli + ' create --name test ' + baseImage + ':' + baseTag, '\$', 5)
-			mySSH.command('mkdir -p cmake_targets/log/ran-base', '\$', 5)
-			mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base', '\$', 5)
-			mySSH.command(self.cli + ' rm -f test', '\$', 5)
+			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+			if result is not None:
+				size = float(result.group("size")) / 1000000
+				imageSizeStr = f'{size:.1f}'
+				logging.debug(f'\u001B[1m   ran-base size is {imageSizeStr} Mbytes\u001B[0m')
+				allImagesSize['ran-base'] = f'{imageSizeStr} Mbytes'
+			else:
+				logging.debug('ran-base size is unknown')
+
+		# Recover build logs, for the moment only possible when build is successful
+		mySSH.command(self.cli + ' create --name test ' + baseImage + ':' + baseTag, '\$', 5)
+		mySSH.command('mkdir -p cmake_targets/log/ran-base', '\$', 5)
+		mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base', '\$', 5)
+		mySSH.command(self.cli + ' rm -f test', '\$', 5)
 
 		# Build the target image(s)
+		status = True
+		attemptedImages = ['ran-base']
 		for image,pattern in imageNames:
+			attemptedImages += [image]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			mySSH.command('sed -i -e "s#' + baseImage + ':latest#' + baseImage + ':' + baseTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5)
+			mySSH.command(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
 			if image != 'ran-build':
-				mySSH.command('sed -i -e "s#' + "ran-build" + ':latest#' + "ran-build" + ':' + imageTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5)
-			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + image + ' --tag ' + image + ':' + imageTag + ' --file docker/Dockerfile.' + pattern + self.dockerfileprefix + ' . > cmake_targets/log/' + image + '.log 2>&1', '\$', 1200)
+				mySSH.command(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
+			mySSH.command(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', '\$', 1200)
 			# Flatten Image
 			if image != 'ran-build':
 				mySSH.command('python3 ./ci-scripts/flatten_image.py --tag ' + image + ':' + imageTag, '\$', 300)
@@ -308,117 +369,43 @@ class Containerize():
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
 				mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
-				self.allImagesSize[image] = 'N/A -- Build Failed'
+				allImagesSize[image] = 'N/A -- Build Failed'
+				break
 			else:
 				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
 				if result is not None:
-					imageSize = float(result.group('size'))
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-						self.allImagesSize[image] = str(round(imageSize,1)) + ' kbytes'
-					else:
-						imageSize = imageSize / 1000
-						if imageSize < 1000:
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Mbytes'
-						else:
-							imageSize = imageSize / 1000
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Gbytes'
+					size = float(result.group("size")) / 1000000
+					imageSizeStr = f'{size:.1f}'
+					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
+					allImagesSize[image] = f'{imageSizeStr} Mbytes'
 				else:
-					logging.debug('ran-base size is unknown')
-					self.allImagesSize[image] = 'unknown'
+					logging.debug(f'{image} size is unknown')
+					allImagesSize[image] = 'unknown'
 			# Now pruning dangling images in between target builds
 			mySSH.command(self.cli + ' image prune --force', '\$', 30)
 
-		# Analyzing the logs
-		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
-		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
-
-		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		mySSH.command('rm -f build_log_' + self.testCase_id + '.zip || true', '\$', 5)
-		if (os.path.isfile('./build_log_' + self.testCase_id + '.zip')):
-			os.remove('./build_log_' + self.testCase_id + '.zip')
-		if (os.path.isdir('./build_log_' + self.testCase_id)):
-			shutil.rmtree('./build_log_' + self.testCase_id)
-		mySSH.command('zip -r -qq build_log_' + self.testCase_id + '.zip build_log_' + self.testCase_id, '\$', 5)
-		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
-		mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
-		# Remove all intermediate build images
+		# Remove all intermediate build images and clean up
 		if self.ranAllowMerge and forceBaseImageBuild:
-			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
-		mySSH.command(self.cli + ' image rm ran-build:' + imageTag + ' || true','\$', 30)
-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
-		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
+			mySSH.command(f'{self.cli} image rm {baseImage}:{baseTag} || true', '\$', 30)
+		mySSH.command(f'{self.cli} image rm ran-build:{imageTag}','\$', 30)
+		mySSH.command(f'{self.cli} volume prune --force','\$', 15)
 
-		#Trying to identify the errors and warnings for each built images
-		imageNames1 = imageNames
-		base = ('ran-base','ran')
-		imageNames1.insert(0, base) 
-		for image,pattern in imageNames1:
-			files = {}
-			file_list = [f for f in os.listdir('build_log_' + self.testCase_id + '/' + image) if os.path.isfile(os.path.join('build_log_' + self.testCase_id + '/' + image, f)) and f.endswith('.txt')]
-			for fil in file_list:
-				errorandwarnings = {}
-				warningsNo = 0
-				errorsNo = 0
-				with open('build_log_{}/{}/{}'.format(self.testCase_id,image,fil), mode='r') as inputfile:
-					for line in inputfile:
-						result = re.search(' ERROR ', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' error:', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' WARNING ', str(line))
-						if result is not None:
-							warningsNo += 1
-						result = re.search(' warning:', str(line))
-						if result is not None:
-							warningsNo += 1
-					errorandwarnings['errors'] = errorsNo
-					errorandwarnings['warnings'] = warningsNo
-					errorandwarnings['status'] = status
-				files[fil] = errorandwarnings
-			# Let analyze the target image creation part
-			if os.path.isfile('build_log_{}/{}.log'.format(self.testCase_id,image)):
-				errorandwarnings = {}
-				with open('build_log_{}/{}.log'.format(self.testCase_id,image), mode='r') as inputfile:
-					startOfTargetImageCreation = False
-					buildStatus = False
-					for line in inputfile:
-						result = re.search('FROM .* [aA][sS] ' + image + '$', str(line))
-						if result is not None:
-							startOfTargetImageCreation = True
-						if startOfTargetImageCreation:
-							result = re.search('Successfully tagged ' + image + ':', str(line))
-							if result is not None:
-								buildStatus = True
-							result = re.search('COMMIT ' + image + ':', str(line))
-							if result is not None:
-								buildStatus = True
-					inputfile.close()
-					if buildStatus:
-						errorandwarnings['errors'] = 0
-					else:
-						errorandwarnings['errors'] = 1
-					errorandwarnings['warnings'] = 0
-					errorandwarnings['status'] = buildStatus
-					files['Target Image Creation'] = errorandwarnings
-			self.collectInfo[image] = files
+		# create a zip with all logs
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, lUserName, lPassWord)
+		mySSH.close()
+
+		# Analyze the logs
+		collectInfo = AnalyzeBuildLogs(build_log_name, attemptedImages, status)
 		
 		if status:
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
 			sys.exit(1)
 
@@ -473,7 +460,7 @@ class Containerize():
 		self.ranCommitID = self.proxyCommit
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		# to prevent accidentally overwriting data that might be used later
 		self.ranCommitID = oldRanCommidID
 		self.ranRepository = oldRanRepository
@@ -532,13 +519,34 @@ class Containerize():
 			# don't delete such that we might recover the zips
 			#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
 
+		# we do not analyze the logs (we assume the proxy builds fine at this stage),
+		# but need to have the following information to correctly display the HTML
+		files = {}
+		errorandwarnings = {}
+		errorandwarnings['errors'] = 0
+		errorandwarnings['warnings'] = 0
+		errorandwarnings['status'] = True
+		files['Target Image Creation'] = errorandwarnings
+		collectInfo = {}
+		collectInfo['proxy'] = files
+		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+		allImagesSize = {}
+		if result is not None:
+			imageSize = float(result.group('size')) / 1000000
+			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
+			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+		else:
+			logging.debug('proxy size is unknown')
+			allImagesSize['proxy'] = 'unknown'
+
 		# Cleaning any created tmp volume
 		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
 		mySSH.close()
 
 		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 
 	def Copy_Image_to_Test_Server(self, HTML):
 		imageTag = 'develop'
@@ -560,9 +568,17 @@ class Containerize():
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
 		lSsh.open(lIpAddr, lUserName, lPassWord)
-		lSsh.command('docker save ' + self.imageToCopy + ':' + imageTag + ' | gzip > ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		lSsh.copyin(lIpAddr, lUserName, lPassWord, '~/' + self.imageToCopy + '-' + imageTag + '.tar.gz', '.')
+		lSsh.command('docker save ' + self.imageToCopy + ':' + imageTag + ' | gzip --fast > ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		ret = lSsh.copyin(lIpAddr, lUserName, lPassWord, '~/' + self.imageToCopy + '-' + imageTag + '.tar.gz', '.')
+		if ret != 0:
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('cannot remove'):
+			HTML.CreateHtmlTestRow('file not created by docker save', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.close()
 
 		# Going to the Test Server
@@ -580,15 +596,26 @@ class Containerize():
 			lPassWord = self.eNB2Password
 		lSsh.open(lIpAddr, lUserName, lPassWord)
 		lSsh.copyout(lIpAddr, lUserName, lPassWord, './' + self.imageToCopy + '-' + imageTag + '.tar.gz', '~')
+		# copyout has no return code and will quit if something fails
 		lSsh.command('docker rmi ' + self.imageToCopy + ':' + imageTag, '\$', 10)
 		lSsh.command('docker load < ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('o such file') or lSsh.getBefore().count('invalid tar header'):
+			logging.debug(lSsh.getBefore())
+			HTML.CreateHtmlTestRow('problem during docker load', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('cannot remove'):
+			HTML.CreateHtmlTestRow('file not copied during scp?', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.close()
 
 		if os.path.isfile('./' + self.imageToCopy + '-' + imageTag + '.tar.gz'):
 			os.remove('./' + self.imageToCopy + '-' + imageTag + '.tar.gz')
 
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def DeployObject(self, HTML, EPC):
 		if self.eNB_serverId[self.eNB_instance] == '0':
@@ -614,7 +641,7 @@ class Containerize():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 
 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
 		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
@@ -637,7 +664,7 @@ class Containerize():
 		result = re.search('service=(?P<svc_name>[a-zA-Z0-9\_]+)', mySSH.getBefore())
 		if result is not None:
 			svcName = result.group('svc_name')
-			mySSH.command('docker-compose --file ci-docker-compose.yml up -d ' + svcName, '\$', 10)
+			mySSH.command('docker-compose --file ci-docker-compose.yml up -d ' + svcName, '\$', 15)
 
 		# Checking Status
 		mySSH.command('docker-compose --file ci-docker-compose.yml config', '\$', 5)
@@ -664,6 +691,9 @@ class Containerize():
 		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
 		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
 
+		self.testCase_id = HTML.testCase_id
+		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
+
 		status = False
 		if healthyNb == 1:
 			cnt = 0
@@ -678,11 +708,12 @@ class Containerize():
 					status = True
 					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
 					time.sleep(10)
+		else:
+			# containers are unhealthy, so we won't start. However, logs are stored at the end
+			# in UndeployObject so we here store the logs of the unhealthy container to report it
+			mySSH.command('docker logs ' + containerName + ' > ' + lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '\$', 30)
 		mySSH.close()
 
-		self.testCase_id = HTML.testCase_id
-		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
-
 		if status:
 			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
@@ -914,12 +945,26 @@ class Containerize():
 		logging.debug(cmd)
 		subprocess.run(cmd, shell=True)
 
-		# if the containers are running, recover the logs!
+		# check which containers are running for log recovery later
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
 		logging.debug(cmd)
-		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+		deployStatusLogs = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+
+		# Stop the containers to shut down objects
+		logging.debug('\u001B[1m Stopping containers \u001B[0m')
+		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml stop'
+		logging.debug(cmd)
+		try:
+			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
+		except Exception as e:
+			self.exitStatus = 1
+			logging.error('Could not stop containers')
+			HTML.CreateHtmlTestRow('Could not stop', 'KO', CONST.ALL_PROCESSES_OK)
+			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
+			return
+
 		anyLogs = False
-		for state in deployStatus.split('\n'):
+		for state in deployStatusLogs.split('\n'):
 			res = re.search('Name|----------', state)
 			if res is not None:
 				continue

ci-scripts/cls_oai_html.py

@@ -453,13 +453,11 @@ class HTMLManagement():
 						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')
 					elif (parameters['warnings'] == 0):
 						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['warnings'])  + '</td>\n')
-					elif ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
-						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					else:
-						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')
+						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" ><font color="white">OK </font></th>\n')
-					elif (parameters['errors'] == 0) and ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
+					elif (parameters['errors'] == 0):
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "orange" ><font color="white">OK </font></th>\n')
 					else:
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" > NOT OK  </th>\n')

ci-scripts/cls_oaicitest.py

@@ -1329,7 +1329,7 @@ class OaiCiTest():
 		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 		if self.ADBCentralized:
 			SSH.command('adb devices', '\$', 15)
-			self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
+			self.UEDevices = re.findall('\r\n([A-Za-z0-9]+)\tdevice',SSH.getBefore())
 			#report number and id of devices found
 			msg = "UEDevices found by GetAllUEDevices : " + " ".join(self.UEDevices)
 			logging.debug(msg)
@@ -1379,8 +1379,7 @@ class OaiCiTest():
 		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 		if self.ADBCentralized:
 			SSH.command('lsusb | egrep --colour=never "Future Technology Devices International, Ltd FT2232C" | sed -e "s#:.*##" -e "s# #_#g"', '\$', 15)
-			#self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
-			self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
+			self.CatMDevices = re.findall('\r\n([A-Za-z0-9_]+)',SSH.getBefore())
 		else:
 			if (os.path.isfile('./modules_list.txt')):
 				os.remove('./modules_list.txt')
@@ -2046,7 +2045,7 @@ class OaiCiTest():
 				req_bandwidth = '%.1f Gbits/sec' % req_bw
 				req_bw = req_bw * 1000000000
 
-		result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
+		result = re.search('Server Report:\r\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
 		if result is not None:
 			bitrate = result.group('bitrate')
 			packetloss = result.group('packetloss')
@@ -2262,7 +2261,7 @@ class OaiCiTest():
 
 	def Iperf_analyzeV3Output(self, lock, UE_IPAddress, device_id, statusQueue,SSH):
 
-		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\\\\r\\\\n(?:|\[ *\d+\] Sent \d+ datagrams)\\\\r\\\\niperf Done\.', SSH.getBefore())
+		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\r\n(?:|\[ *\d+\] Sent \d+ datagrams)\r\niperf Done\.', SSH.getBefore())
 		if result is None:
 			result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', SSH.getBefore())
 			lock.acquire()
@@ -3865,7 +3864,7 @@ class OaiCiTest():
 		SSH = sshconnection.SSHConnection()
 		SSH.open(IPAddress, UserName, Password)
 		SSH.command('lsb_release -a', '\$', 5)
-		result = re.search('Description:\\\\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
+		result = re.search('Description:\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
 		if result is not None:
 			OsVersion = result.group('os_type')
 			logging.debug('OS is: ' + OsVersion)
@@ -3883,13 +3882,13 @@ class OaiCiTest():
 				logging.debug('OS is: ' + OsVersion)
 				HTML.OsVersion[idx]=OsVersion
 		SSH.command('uname -r', '\$', 5)
-		result = re.search('uname -r\\\\r\\\\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
+		result = re.search('uname -r\r\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
 		if result is not None:
 			KernelVersion = result.group('kernel_version')
 			logging.debug('Kernel Version is: ' + KernelVersion)
 			HTML.KernelVersion[idx]=KernelVersion
-		SSH.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
-		result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
+		SSH.command('dpkg --list | egrep --color=never libuhd', '\$', 5)
+		result = re.search('libuhd.*:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
 		if result is not None:
 			UhdVersion = result.group('uhd_version')
 			logging.debug('UHD Version is: ' + UhdVersion)
@@ -3902,7 +3901,7 @@ class OaiCiTest():
 				logging.debug('UHD Version is: ' + UhdVersion)
 				HTML.UhdVersion[idx]=UhdVersion
 		SSH.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 180)
-		usrp_boards = re.findall('product: ([0-9A-Za-z]+)\\\\r\\\\n', SSH.getBefore())
+		usrp_boards = re.findall('product: ([0-9A-Za-z]+)', SSH.getBefore())
 		count = 0
 		for board in usrp_boards:
 			if count == 0:
@@ -3914,14 +3913,18 @@ class OaiCiTest():
 			logging.debug('USRP Board(s) : ' + UsrpBoard)
 			HTML.UsrpBoard[idx]=UsrpBoard
 		SSH.command('lscpu', '\$', 5)
-		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+).*Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+).*CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
+		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+)', SSH.getBefore())
 		if result is not None:
 			CpuNb = result.group('nb_cpus')
 			logging.debug('nb_cpus: ' + CpuNb)
 			HTML.CpuNb[idx]=CpuNb
+		result = re.search('Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+)', SSH.getBefore())
+		if result is not None:
 			CpuModel = result.group('model')
 			logging.debug('model: ' + CpuModel)
 			HTML.CpuModel[idx]=CpuModel
+		result = re.search('CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
+		if result is not None:
 			CpuMHz = result.group('cpu_mhz') + ' MHz'
 			logging.debug('cpu_mhz: ' + CpuMHz)
 			HTML.CpuMHz[idx]=CpuMHz

ci-scripts/cls_physim.py

@@ -56,7 +56,6 @@ class PhySim:
 		self.__workSpacePath=''
 		self.__buildLogFile='compile_phy_sim.log'
 		self.__runLogFile=''
-		self.__runResults=[]
 		self.__runLogPath='phy_sim_logs'
 
 
@@ -64,20 +63,20 @@ class PhySim:
 #PRIVATE Methods
 #-----------------
 
-	def __CheckResults_PhySim(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
 		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
 		mySSH.close()
 		#parse results looking for Encoding and Decoding mean values
-		self.__runResults=[]
+		runResults=[]
 		with open(self.__runLogFile) as f:
 			for line in f:
 				if 'mean' in line:
-					self.__runResults.append(line)
+					runResults.append(line)
 		#the values are appended for each mean value (2), so we take these 2 values from the list
-		info=self.__runResults[0]+self.__runResults[1]
+		info = runResults[0] + runResults[1]
 
 		#once parsed move the local logfile to its folder for tidiness
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
@@ -89,6 +88,38 @@ class PhySim:
 		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
 		return HTML
 
+	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		html_queue = SimpleQueue()
+		#retrieve run log file and store it locally
+		mySSH = sshconnection.SSHConnection()
+		filename = self.__workSpacePath + self.__runLogFile
+		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
+		if ret != 0:
+			error_msg = f'could not recover test result file {filename}'
+			logging.error(error_msg)
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', 1, html_queue)
+			self.exitStatus = 1
+			return HTML
+
+		PUSCH_OK = False
+		with open(self.__runLogFile) as f:
+			PUSCH_OK = 'PUSCH test OK' in f.read()
+
+		# once parsed move the local logfile to its folder for tidiness
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+
+		#updating the HTML with results
+		if PUSCH_OK:
+			html_queue.put('<pre style="background-color:white">succeeded</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+		else:
+			error_msg = 'error: no "PUSCH test OK"'
+			logging.error(error_msg)
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, html_queue)
+			self.exitStatus = 1
+		return HTML
 
 	def __CheckBuild_PhySim(self, HTML, CONST):
 		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
@@ -100,21 +131,16 @@ class PhySim:
 		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
 		mySSH.close()
 		#check build result from local compile log file
-		buildStatus=False
 		with open(self.__buildLogFile) as f:
-		#nr_prachsim is the last compile step
-			if 'nr_prachsim compiled' in f.read():
-				buildStatus=True
-		#update HTML based on build status
-		if buildStatus:
-			HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC')
-			self.exitStatus=0
-		else:
-			logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
-			HTML.CreateHtmlTabFooter(False)
-			#exitStatus=1 will do a sys.exit in main
-			self.exitStatus=1
+			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
+				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
+				self.exitStatus=0
+				return HTML
+		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
+		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
+		HTML.CreateHtmlTabFooter(False)
+		#exitStatus=1 will do a sys.exit in main
+		self.exitStatus = 1
 		return HTML
 
 
@@ -163,8 +189,7 @@ class PhySim:
 		mySSH.command('source oaienv', '\$', 5)
 		mySSH.command('cd cmake_targets', '\$', 5)
 		mySSH.command('mkdir -p log', '\$', 5)
-		mySSH.command('chmod 777 log', '\$', 5)
-		mySSH.command('stdbuf -o0 ./build_oai ' + self.buildargs + ' 2>&1 | stdbuf -o0 tee ' + self.__buildLogFile, 'Bypassing the Tests|build have failed', 1500)
+		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)
 
 		mySSH.close()
 		#check build status and update HTML object
@@ -173,7 +198,8 @@ class PhySim:
 		return lHTML
 
 
-	def Run_PhySim(self,htmlObj,constObj,testcase_id):
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
 		#log file is tc_<testcase_id>.log remotely
@@ -187,5 +213,18 @@ class PhySim:
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_PhySim(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
+		return lHTML
+
+	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		self.__runLogFile = f'physim_{testcase_id}.log'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
 		return lHTML

ci-scripts/cls_physim1.py

@@ -115,33 +115,9 @@ class PhySim:
 				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
 		else:
 			imageTag = "develop"
-		# Check if image is exist on the Red Hat server, before pushing it to OC cluster
-		mySSH.command('sudo podman image inspect --format="Size = {{.Size}} bytes" oai-physim:' + imageTag, '\$', 60)
-		if mySSH.getBefore().count('no such image') != 0:
-			logging.error('\u001B[1m No such image oai-physim\u001B[0m')
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.PHYSIM_IMAGE_ABSENT)
-			RAN.prematureExit = True
-			return
-		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-			if result is not None:
-				imageSize = float(result.group('size'))
-				imageSize = imageSize / 1000
-				if imageSize < 1000:
-					logging.debug('\u001B[1m   oai-physim size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-				else:
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   oai-physim size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-					else:
-						imageSize = imageSize / 1000
-						logging.debug('\u001B[1m   oai-physim is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-			else:
-				logging.debug('oai-physim size is unknown')
 
 		# logging to OC Cluster and then switch to corresponding project
-		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword}', '\$', 30)
+		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30)
 		if mySSH.getBefore().count('Login successful.') == 0:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			mySSH.close()
@@ -161,46 +137,7 @@ class PhySim:
 		else:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')
 
-		# Tag the image and push to the OC cluster
-		mySSH.command('oc whoami -t | sudo podman login -u ' + ocUserName + ' --password-stdin https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/ --tls-verify=false', '\$', 30)
-		if mySSH.getBefore().count('Login Succeeded!') == 0:
-			logging.error('\u001B[1m Podman Login to OC Cluster Registry Failed\u001B[0m')
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug('\u001B[1m Podman Login to OC Cluster Registry Successfully\u001B[0m')
-		time.sleep(2)
-		mySSH.command('oc create -f openshift/oai-physim-image-stream.yml || true', '\$', 30)
-		if mySSH.getBefore().count('(AlreadyExists):') == 0 and mySSH.getBefore().count('created') == 0:
-			logging.error(f'\u001B[1m Image Stream "oai-physim" Creation Failed on OC Cluster {ocProjectName}\u001B[0m')
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_IS_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug(f'\u001B[1m   Image Stream "oai-physim" created on OC project {ocProjectName}\u001B[0m')
-		time.sleep(2)
-		mySSH.command(f'sudo podman tag oai-physim:{imageTag} default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 30)
-		time.sleep(2)
-		mySSH.command(f'sudo podman push default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag} --tls-verify=false', '\$', 180)
-		if mySSH.getBefore().count('Storing signatures') == 0:
-			logging.error('\u001B[1m Image "oai-physim" push to OC Cluster Registry Failed\u001B[0m')
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_IS_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug('\u001B[1m Image "oai-physim" push to OC Cluster Registry Successfully\u001B[0m')
-
 		# Using helm charts deployment
-		time.sleep(5)
 		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
 		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
 		mySSH.command('helm install physim ./charts/physims/ 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
@@ -213,9 +150,6 @@ class PhySim:
 				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
-			mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 30)
-			mySSH.command('oc delete is oai-physim', '\$', 30)
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			self.AnalyzeLogFile_phySim(HTML)
@@ -244,9 +178,6 @@ class PhySim:
 				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
-			mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 6)
-			mySSH.command('oc delete is oai-physim', '\$', 6)
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 			mySSH.command('oc logout', '\$', 30)
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PHYSIM_DEPLOY_FAIL)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
@@ -304,10 +235,6 @@ class PhySim:
 				isFinished1 = True
 		if isFinished1 == True:
 			logging.debug('\u001B[1m UnDeployed PhySim Successfully on OC Cluster\u001B[0m')
-		mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 6)
-		mySSH.command('oc delete is oai-physim', '\$', 6)
-		logging.debug('\u001B[1m Deleted the Image and ImageStream\u001B[0m')
-		mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 		mySSH.command('oc logout', '\$', 6)
 		mySSH.close()
 		self.AnalyzeLogFile_phySim(HTML)

ci-scripts/cls_static_code_analysis.py

@@ -321,20 +321,6 @@ class StaticCodeAnalysis():
 					if ret is not None:
 						analyzed = True
 					if analyzed:
-						ret = re.search('Nb Files that do NOT follow OAI rules: (?P<nb_errors>[0-9\.]+)', str(line))
-						if ret is not None:
-							nbFilesNotFormatted = int(ret.group('nb_errors'))
-
-						if re.search('=== Files not properly formatted ===', str(line)) is not None:
-							listFiles = True
-						if listFiles:
-							if re.search('Removing intermediate container', str(line)) is not None:
-								listFiles = False
-							elif re.search('Running in|Files not properly formatted', str(line)) is not None:
-								pass
-							else:
-								listFilesNotFormatted.append(str(line).strip())
-
 						if re.search('=== Files with incorrect define protection ===', str(line)) is not None:
 							circularHeaderDependency = True
 						if circularHeaderDependency:

ci-scripts/conf_files/benetel-5g.conf

@@ -214,7 +214,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
 }
 );
 

ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -11,22 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  40960;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 95;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L;
 
@@ -214,52 +199,6 @@ MACRLCs = (
         }
 );
 
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         #clock_src = "external";
-         sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal"
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf

@@ -218,16 +218,6 @@ MACRLCs = (
         }
 )
 
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 log_config =
     {
       global_log_level                      ="info";

ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -11,22 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L;
 
@@ -215,52 +200,6 @@ MACRLCs = (
         }
 );
 
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         #clock_src = "external";
-         sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal"
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf

@@ -235,16 +235,6 @@ MACRLCs = (
         }
 )
 
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 log_config =
     {
       global_log_level                      ="info";

ci-scripts/conf_files/gNB_SA_CU.conf

@@ -15,22 +15,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                    {        
-                      sst = 1;
-                      sd  = 0x010203; // 0 false, else true
-                    },
-                    {   
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
 
     nr_cellid = 12345678L;

ci-scripts/conf_files/gNB_SA_DU.conf

@@ -14,22 +14,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                    {        
-                      sst = 1;
-                      sd  = 0x010203; // 0 false, else true
-                    },
-                    {   
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
 
     nr_cellid = 12345678L;
@@ -204,8 +189,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 200;
   pucch0_dtx_threshold = 150;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }

ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf

@@ -15,21 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                                {        
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true 
-                                },
-                                                                                                                                                                   {   
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L 
 
@@ -231,7 +217,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
   pucch0_dtx_threshold = 150;
 }

ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf

@@ -16,21 +16,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                                {        
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true 
-                                },
-                                                                                                                                                                   {   
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L 
 
@@ -228,7 +214,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
 }
 );

ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf

@@ -211,7 +211,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf

@@ -181,7 +181,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf

@@ -210,7 +210,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
   pucch0_dtx_threshold = 80;
 }

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf

@@ -15,25 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x1; // 0 false, else true
-                                },
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });
 
     nr_cellid = 12345678L
 
@@ -237,7 +219,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf

@@ -15,21 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L
 
@@ -234,7 +220,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf

@@ -15,21 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });
 
     nr_cellid = 12345678L
 
@@ -233,7 +219,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -15,21 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L
 
@@ -237,7 +223,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
 }
 );

ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf

@@ -15,21 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });
 
     nr_cellid = 12345678L
 
@@ -235,7 +221,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
   prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }

ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -194,7 +194,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 8;
 }
 );
 

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -210,7 +210,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 6;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf

@@ -211,7 +211,6 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  thread_pool_size = 6;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -11,28 +11,14 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 95;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 2;
-                      sd  = 2; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    enable_sdap = 1;
 
      pdcch_ConfigSIB1 = (
       {
@@ -217,6 +203,7 @@ L1s = (
         num_cc = 1;
         tr_n_preference = "local_mac";
         pusch_proc_threads = 8;
+        prach_dtx_threshold = 200;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
     }
 );

ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf

@@ -11,18 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 222;
-                  mnc = 01;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      #sd  = 0x1; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
 
     nr_cellid = 12345678L;
 

ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf

@@ -11,22 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
 
     nr_cellid = 12345678L;
 

ci-scripts/conf_files/nr-ue-sim.conf

@@ -4,5 +4,4 @@ uicc0 = {
   opc= "@OPC@";
   dnn= "@DNN@";
   nssai_sst=@NSSAI_SST@;
-  nssai_sd=@NSSAI_SD@;
 }

ci-scripts/constants.py

@@ -46,6 +46,7 @@ ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
 ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
 ENB_REAL_TIME_PROCESSING_ISSUE = -16
 ENB_RETX_ISSUE = -17
+ENB_SHUTDOWN_NO_BYE = -18
 HSS_PROCESS_FAILED = -2
 HSS_PROCESS_OK = +2
 MME_PROCESS_FAILED = -3
@@ -78,3 +79,7 @@ X2_HO_REQ_STATE__TARGET_RECEIVES_REQ = 1
 X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE = 2
 X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ = 3
 X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK = 10
+
+# placeholder for a "don't care" password to gradually transition to
+# passwordless CI
+CI_NO_PASSWORD = "CIPASSWORDDONTCARE"

ci-scripts/docker/Dockerfile.formatting.bionic

@@ -8,7 +8,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-       astyle \
        gawk \
        git
 
@@ -18,9 +17,6 @@ COPY . .
 RUN /bin/bash -c "if [[ -v MERGE_REQUEST ]]; then echo 'Source Branch = $SRC_BRANCH'; echo 'Target Branch = $TARGET_BRANCH'; else echo 'Push to develop'; fi"
 RUN /bin/bash -c "if [[ -v MERGE_REQUEST ]]; then ./ci-scripts/checkCodingFormattingRules.sh --src-branch $SRC_BRANCH --target-branch $TARGET_BRANCH; else ./ci-scripts/checkCodingFormattingRules.sh; fi"
 
-RUN echo "=== Files not properly formatted ===" && \
-    /bin/bash -c "if [[ -f oai_rules_result_list.txt ]]; then cat oai_rules_result_list.txt; fi"
-
 RUN echo "=== Files with incorrect define protection ===" && \
    /bin/bash -c "if [[ -f header-files-w-incorrect-define.txt ]]; then cat header-files-w-incorrect-define.txt; fi"
 

ci-scripts/epc.py

@@ -253,7 +253,7 @@ class EPCManagement():
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
 			if re.search('start-mini-as-ue', self.cfgDeploy):
 				dFile = 'docker-compose-mini-nrf-asue.yaml'
@@ -537,7 +537,7 @@ class EPCManagement():
 				mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)
 
 			logging.debug('Terminating OAI CN5G')
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)

ci-scripts/main.py

@@ -45,6 +45,7 @@ import cls_containerize         #class Containerize for all container-based oper
 import cls_static_code_analysis #class for static code analysis
 import cls_ci_ueinfra			#class defining the multi Ue infrastrucure
 import cls_physim1          #class PhySim for physical simulators deploy and run
+import cls_cluster              # class for building/deploying on cluster
 
 import sshconnection 
 import epc
@@ -102,20 +103,17 @@ def AssignParams(params_dict):
 
 
 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy':
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
-		if (forced_workspace_cleanup is None):
-			RAN.Build_eNB_forced_workspace_cleanup=False
-			CONTAINERS.forcedWorkspaceCleanup=False
-		else:
-			if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
-				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=True
-			else:
-				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=False
+		RAN.Build_eNB_forced_workspace_cleanup=False
+		CONTAINERS.forcedWorkspaceCleanup=False
+		CLUSTER.forcedWorkspaceCleanup = False
+		if forced_workspace_cleanup is not None and re.match('true', forced_workspace_cleanup, re.IGNORECASE):
+			RAN.Build_eNB_forced_workspace_cleanup = True
+			CONTAINERS.forcedWorkspaceCleanup = True
+			CLUSTER.forcedWorkspaceCleanup = True
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
 			RAN.eNB_instance=0
@@ -457,9 +455,18 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.testSvrId = string_field
 
-	else: # ie action == 'Run_PhySim':
+	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest':
 		ldpc.runargs = test.findtext('physim_run_args')
-		
+
+	elif action == 'LicenceAndFormattingCheck':
+		pass
+
+	elif action == 'Cppcheck_Analysis':
+		pass
+
+	else:
+		logging.error(f"unknown action {action}")
+
 
 #check if given test is in list
 #it is in list if one of the strings in 'list' is at the beginning of 'test'
@@ -525,6 +532,7 @@ HTML = cls_oai_html.HTMLManagement()
 CONTAINERS = cls_containerize.Containerize()
 SCA = cls_static_code_analysis.StaticCodeAnalysis()
 PHYSIM = cls_physim1.PhySim()
+CLUSTER = cls_cluster.Cluster()
 
 ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU build
 
@@ -534,7 +542,7 @@ ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU b
 #-----------------------------------------------------------
 
 import args_parse
-py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM)
+py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)
 
 
 
@@ -914,14 +922,25 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					HTML=ldpc.Build_PhySim(HTML,CONST)
 					if ldpc.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'Run_PhySim':
-					HTML=ldpc.Run_PhySim(HTML,CONST,id)
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_NRulsimTest':
+					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Build_Cluster_Image':
+					if not CLUSTER.BuildClusterImage(HTML):
+						RAN.prematureExit = True
 				elif action == 'Build_Image':
 					CONTAINERS.BuildImage(HTML)
 				elif action == 'Build_Proxy':
 					CONTAINERS.BuildProxy(HTML)
 				elif action == 'Copy_Image_to_Test':
-					CONTAINERS.Copy_Image_to_Test_Server(HTML)
+					success = CONTAINERS.Copy_Image_to_Test_Server(HTML)
+					if not success:
+						RAN.prematureExit = True
 				elif action == 'Deploy_Object':
 					CONTAINERS.DeployObject(HTML, EPC)
 					if CONTAINERS.exitStatus==1:

ci-scripts/oai-ci-vm-tool

@@ -177,7 +177,7 @@ function variant__v1__enb_usrp {
 
 function variant__v2__basic_sim {
     NB_PATTERN_FILES=11
-    BUILD_OPTIONS="--eNB --UE"
+    BUILD_OPTIONS="--eNB --UE --noavx512"
     VM_MEMORY=8192
     RUN_OPTIONS="complex"
 }
@@ -201,28 +201,28 @@ function variant__v5__gnb_usrp {
     VM_MEMORY=10240
     VM_CPU=8
     NB_PATTERN_FILES=6
-    BUILD_OPTIONS="--gNB -w USRP"
+    BUILD_OPTIONS="--gNB -w USRP --noavx512"
 }
 
 function variant__v6__nr_ue_usrp {
     VM_MEMORY=4096
     VM_CPU=4
     NB_PATTERN_FILES=6
-    BUILD_OPTIONS="--nrUE -w USRP"
+    BUILD_OPTIONS="--nrUE -w USRP --noavx512"
 }
 
 function variant__v7__enb_ethernet {
     VM_MEMORY=4096
     ARCHIVES_LOC=enb_eth
     NB_PATTERN_FILES=6
-    BUILD_OPTIONS="--eNB -w USRP"
+    BUILD_OPTIONS="--eNB -w USRP --noavx512"
 }
 
 function variant__v8__ue_ethernet {
     VM_MEMORY=4096
     ARCHIVES_LOC=ue_eth
     NB_PATTERN_FILES=10
-    BUILD_OPTIONS="--UE -w USRP"
+    BUILD_OPTIONS="--UE -w USRP --noavx512"
 }
 
 function variant__v10__flexran_rtc {

ci-scripts/ran.py

@@ -374,7 +374,7 @@ class RANManagement():
 			mySSH.open(lIpAddr, lUserName, lPassWord)
 			eth_interface = 'any'
 			fltr = 'sctp'
-			logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
+			logging.debug('\u001B[1m Launching tshark on xNB on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 			pcapfile = pcapfile_prefix + self.testCase_id + '_log.pcap'
 			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -f /tmp/' + pcapfile , '\$', 5)
 			mySSH.command('echo $USER; nohup sudo -E tshark  -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + pcapfile + ' > /dev/null 2>&1 &','\$', 5)
@@ -390,7 +390,7 @@ class RANManagement():
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
 			eth_interface = 'any'
 			fltr = 'sctp'
-			logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
+			logging.debug('\u001B[1m Launching tshark on EPC on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 			self.epcPcapFile = 'enb_' + self.testCase_id + '_s1log.pcap'
 			mySSH.command('echo ' + localEpcPassword + ' | sudo -S rm -f /tmp/' + self.epcPcapFile , '\$', 5)
 			mySSH.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + self.epcPcapFile + ' > /tmp/tshark.log 2>&1 &', localEpcUserName, 5)
@@ -517,7 +517,7 @@ class RANManagement():
 				localEpcUserName = EPC.UserName
 				localEpcPassword = EPC.Password
 				mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
-				logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+				logging.debug('\u001B[1m Stopping tshark on EPC \u001B[0m')
 				mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 				if self.epcPcapFile  != '':
 					mySSH.command('echo ' + localEpcPassword + ' | sudo -S chmod 666 /tmp/' + self.epcPcapFile, '\$', 5)
@@ -644,18 +644,16 @@ class RANManagement():
 				time.sleep(5)
 		mySSH.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		#stopping tshark (valid if eNB and enabled in xml, will not harm otherwise)
-		logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+		logging.debug('\u001B[1m Stopping tshark on xNB \u001B[0m')
 		mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 		time.sleep(1)
 		mySSH.close()
-		# If tracer options is on, stopping tshark on EPC side
-		result = re.search('T_stdout', str(self.Initialize_eNB_args))
-		if (result is not None):
+		if EPC.IPAddress != "none" and EPC.IPAddress != '':
 			localEpcIpAddr = EPC.IPAddress
 			localEpcUserName = EPC.UserName
 			localEpcPassword = EPC.Password
+			logging.debug('\u001B[1m Stopping tshark on EPC (' + localEpcIpAddr + ') \u001B[0m')
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
-			logging.debug('\u001B[1m Stopping tshark \u001B[0m')
 			mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 			time.sleep(1)
 			if self.epcPcapFile != '':
@@ -814,6 +812,7 @@ class RANManagement():
 		ULRetxIssue = False
 		nrRrcRcfgComplete = 0
 		harqFeedbackPast = 0
+		showedByeMsg = False # last line is Bye. -> stopped properly
 	
 		line_cnt=0 #log file line counter
 		for line in enb_log_file.readlines():
@@ -1026,6 +1025,12 @@ class RANManagement():
 				if result is not None:
 					gnb_markers[k].append(line_cnt)
 
+			# check whether e/gNB log finishes with "Bye." message
+			# Note that it is "=" not "|=" so not only is the regex
+			# asking for EOF (\Z) but we also only retain the last
+			# line's result
+			showedByeMsg = re.search(r'^Bye.\n\Z', str(line), re.MULTILINE) is not None
+
 		enb_log_file.close()
 
 
@@ -1210,6 +1215,13 @@ class RANManagement():
 				logging.debug('No real time stats found in the log file')
 				htmleNBFailureMsg += statMsg
 
+			if not showedByeMsg:
+				logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB did not show "Bye." message at end, it likely did not stop properly! \u001B[0m')
+				htmleNBFailureMsg += 'No Bye. message found, did not stop properly\n'
+				global_status = CONST.ENB_SHUTDOWN_NO_BYE
+			else:
+				logging.debug('"Bye." message found at end.')
+
 		else:
 			#Removing UE log
 			statMsg = '[MAC] Removing UE msg count =  '+str(removing_ue)

ci-scripts/reportBuildLocally.sh

@@ -463,106 +463,75 @@ function report_build {
     echo "   </table>" >> ./build_results.html
     echo "   <h2>Build Summary</h2>" >> ./build_results.html
 
-    if [ -f ./oai_rules_result.txt ]
+    echo "   <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
+    if [ -f ./header-files-w-incorrect-define.txt ]
     then
-        echo "   <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
-        NB_FILES=`cat ./oai_rules_result.txt`
-        if [ $NB_FILES = "0" ]
-        then 
+        NB_FILES_IN_ERROR=`wc -l ./header-files-w-incorrect-define.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -eq 0 ]
+        then
             echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>All files in repository follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>All modified files in Merge-Request follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in modified files</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
             echo "   </div>" >> ./build_results.html
         else
             echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES files in repository DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES modified files in Merge-Request DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
             echo "   </div>" >> ./build_results.html
-        fi
-        if [ -f ./oai_rules_result_list.txt ]
-        then
-            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-formatting-details\">More details on formatting check</button>" >> ./build_results.html
-            echo "   <div id=\"oai-formatting-details\" class=\"collapse\">" >> ./build_results.html
-            echo "   <p>Please apply the following command to this(ese) file(s): </p>" >> ./build_results.html
-            echo "   <p style=\"margin-left: 30px\"><strong><code>astyle --options=ci-scripts/astyle-options.txt filename(s)</code></strong></p>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-circular-details\">More details on circular dependency protection check</button>" >> ./build_results.html
+            echo "   <div id=\"oai-circular-details\" class=\"collapse\">" >> ./build_results.html
             echo "   <table border = 1>" >> ./build_results.html
             echo "      <tr>" >> ./build_results.html
-            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Potential Issue</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Impacted File</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Incorrect Macro</th>" >> ./build_results.html
             echo "      </tr>" >> ./build_results.html
-            awk '{print "      <tr><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
+            awk '{if($0 ~/error in/){print "      <tr><td>error in declaration</td><td>"$4"</td><td>"$5"</td></tr>"};if($0 ~/files with same/){print "      <tr><td>files with same #define</td><td>"$5"</td><td>"$6"</td></tr>"}}' ./header-files-w-incorrect-define.txt >> ./build_results.html
             echo "   </table>" >> ./build_results.html
             echo "   </div>" >> ./build_results.html
             echo "   <br>" >> ./build_results.html
         fi
-        if [ -f ./header-files-w-incorrect-define.txt ]
+    fi
+    if [ -f ./files-w-gnu-gpl-license-banner.txt ]
+    then
+        NB_FILES_IN_ERROR=`wc -l ./files-w-gnu-gpl-license-banner.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -ne 0 ]
         then
-            NB_FILES_IN_ERROR=`wc -l ./header-files-w-incorrect-define.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -eq 0 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in modified files</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-            else
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-circular-details\">More details on circular dependency protection check</button>" >> ./build_results.html
-                echo "   <div id=\"oai-circular-details\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Potential Issue</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Impacted File</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Incorrect Macro</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{if($0 ~/error in/){print "      <tr><td>error in declaration</td><td>"$4"</td><td>"$5"</td></tr>"};if($0 ~/files with same/){print "      <tr><td>files with same #define</td><td>"$5"</td><td>"$6"</td></tr>"}}' ./header-files-w-incorrect-define.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
+            echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
+            echo "   </div>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-gpl\">More details on GNU GPL license banner issue</button>" >> ./build_results.html
+            echo "   <div id=\"oai-license-gpl\" class=\"collapse\">" >> ./build_results.html
+            echo "   <table border = 1>" >> ./build_results.html
+            echo "      <tr>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "      </tr>" >> ./build_results.html
+            awk '{print "      <tr><td>"$1"</td></tr>"}' ./files-w-gnu-gpl-license-banner.txt >> ./build_results.html
+            echo "   </table>" >> ./build_results.html
+            echo "   </div>" >> ./build_results.html
+            echo "   <br>" >> ./build_results.html
         fi
-        if [ -f ./files-w-gnu-gpl-license-banner.txt ]
+    fi
+    if [ -f ./files-w-suspect-banner.txt ]
+    then
+        NB_FILES_IN_ERROR=`wc -l ./files-w-suspect-banner.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -ne 0 ]
         then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-gnu-gpl-license-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-gpl\">More details on GNU GPL license banner issue</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-gpl\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{print "      <tr><td>"$1"</td></tr>"}' ./files-w-gnu-gpl-license-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
-        fi
-        if [ -f ./files-w-suspect-banner.txt ]
-        then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-suspect-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-suspect\">More details on suspect banner files</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-suspect\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{print "      <tr><td>"$1"</td></tr>"}' ././files-w-suspect-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
+            echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a suspect license banner</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a suspect license banner</strong>" >> ./build_results.html; fi
+            echo "   </div>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-suspect\">More details on suspect banner files</button>" >> ./build_results.html
+            echo "   <div id=\"oai-license-suspect\" class=\"collapse\">" >> ./build_results.html
+            echo "   <table border = 1>" >> ./build_results.html
+            echo "      <tr>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "      </tr>" >> ./build_results.html
+            awk '{print "      <tr><td>"$1"</td></tr>"}' ././files-w-suspect-banner.txt >> ./build_results.html
+            echo "   </table>" >> ./build_results.html
+            echo "   </div>" >> ./build_results.html
+            echo "   <br>" >> ./build_results.html
         fi
     fi
 

ci-scripts/xml_class_list.yml

@@ -1,6 +1,8 @@
   - Build_Proxy
+  - Build_Cluster_Image
   - Build_PhySim
-  - Run_PhySim
+  - Run_LDPCTest
+  - Run_NRulsimTest
   - Build_eNB
   - WaitEndBuild_eNB
   - Initialize_eNB

ci-scripts/xml_files/benetel_nsa_quectel.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
 	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>3</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030000
  040000

ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
 	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>3</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030000
  040000

ci-scripts/xml_files/cluster_image_build.xml

@@ -0,0 +1,35 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+-->
+
+<testCaseList>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build Images on Cluster</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>000001</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>Build_Cluster_Image</class>
+		<desc>Build Images on OpenShift Cluster</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_4g_l2sim_proxy.xml

@@ -21,7 +21,7 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>l2sim-5gnr-proxy-build</htmlTabRef>
+        <htmlTabRef>l2sim-4glte-proxy-build</htmlTabRef>
         <htmlTabName>Build L2sim proxy image</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -0,0 +1,135 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
+        <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 100001
+ 000000
+ 000001
+ 000002
+ 000003
+ 000011
+ 200000
+ 020001
+ 020002
+ 030011
+ 030012
+ 200001
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy Cassandra Database</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>cassandra db_init</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000001">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 4G CoreNetwork</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+                <nb_healthy>7</nb_healthy>
+        </testCase>
+
+        <testCase id="000002">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 4G eNB L2 sim</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>oai_enb</services>
+                <nb_healthy>8</nb_healthy>
+        </testCase>
+
+        <testCase id="000003">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>proxy oai_ue1</services>
+                <nb_healthy>10</nb_healthy>
+        </testCase>
+
+        <testCase id="000011">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
+
+        <testCase id="020001">
+                <class>PingFromContainer</class>
+                <desc>Ping trf-gen from LTE-UE 1</desc>
+                <container_name>l2sim4g-oai-lte-ue1</container_name>
+                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>PingFromContainer</class>
+                <desc>Ping LTE-UE 1 from trf-gen</desc>
+                <container_name>l2sim4g-trf-gen</container_name>
+                <options>-c 20 12.0.0.2</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="030011">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>l2sim4g-oai-lte-ue1</server_container_name>
+                <client_container_name>l2sim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 1M</client_options>
+        </testCase>
+
+        <testCase id="030012">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>l2sim4g-trf-gen</server_container_name>
+                <client_container_name>l2sim4g-oai-lte-ue1</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 3M</client_options>
+        </testCase>
+
+        <testCase id="100001">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 4G stack</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+        <testCase id="200000">
+                <class>StatsFromGenObject</class>
+                <desc>Statistics before Traffic Test</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+        <testCase id="200001">
+                <class>StatsFromGenObject</class>
+                <desc>Statistics after Traffic Test</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml

@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-down</htmlTabRef>
+        <htmlTabName>CleanUp 4G L2 sim - FDD eNB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100002
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100002">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 4G stack</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -24,7 +24,7 @@
         <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
         <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
-		<repeatCount>2</repeatCount>
+		<repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  100011
  000011

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim in containers - CU-DU F1 split</htmlTabName>
+        <htmlTabName>CU-DU F1 split</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  100021

ci-scripts/xml_files/container_5g_f1_rfsim_down.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-down-f1</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - CU-DU F1 split</htmlTabName>
+        <htmlTabName>CleanUp CU-DU F1 split</htmlTabName>
         <htmlTabIcon>trash</htmlTabIcon>
         <TestCaseRequestedList>
  100022

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -22,9 +22,9 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim - Monolithic FDD gNB</htmlTabName>
+        <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>4</repeatCount>
+        <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  100011
  000010

ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-fdd-down</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - Monolithic FDD gNB</htmlTabName>
+        <htmlTabName>CleanUp Monolithic FDD gNB with SDAP</htmlTabName>
         <htmlTabIcon>trash</htmlTabIcon>
         <TestCaseRequestedList>
  100012

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -24,7 +24,7 @@
         <htmlTabRef>l2sim-5gnr-tdd</htmlTabRef>
         <htmlTabName>Testing 5G NR L2 sim - TDD gNB</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>2</repeatCount>
+        <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  100001
  000000

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -22,9 +22,9 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim - Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>Monolithic TDD gNB</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>4</repeatCount>
+        <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  100001
  000000

ci-scripts/xml_files/container_5g_rfsim_down.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>CleanUp Monolithic TDD gNB</htmlTabName>
         <htmlTabIcon>trash</htmlTabIcon>
         <TestCaseRequestedList>
  100002

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -0,0 +1,42 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
+        <htmlTabName>Build L2sim proxy image</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 000001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="000001">
+                <class>Build_Proxy</class>
+                <desc>Build L2sim Proxy Image</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+                <forced_workspace_cleanup>True</forced_workspace_cleanup>
+                <proxy_commit>56cfdc0</proxy_commit>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-fembms-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-FEMBMS-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030104 000001 090104 000002 040605 000001 090109 030201

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-mbms-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-MBMS-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030103 000001 090103 000002 040605 000001 090109 030201

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

@@ -25,7 +25,7 @@
 	<htmlTabRef>test-05-tm2</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM2</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040608</TestMinId>
         <TestCaseRequestedList>

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-20-tm1</htmlTabRef>
 	<htmlTabName>Test-20MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040623</TestMinId>
 	<TestCaseRequestedList>

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-rrc-no-flex</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-rrc-w-flex</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity-FlexRan</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10-cdrx-tm1</htmlTabRef>
 	<htmlTabName>Test-10MHz-CDRX-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.xml

@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-f1-05</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-05MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030142 030141 000002 040301 000002 040541 040601 040641 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030141">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030142">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.25PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040541">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.xml

@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-f1-10</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-10MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030152 030151 000002 040301 000002 040551 040611 040651 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030151">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030152">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.50PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040551">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040611">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.xml

@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-f1-20</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-20MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030162 030161 000002 040301 000002 040561 040621 040661 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030161">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030162">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.100PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040561">
-		<class>Ping</class>
-		<desc>ping (20MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040621">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml

@@ -24,7 +24,7 @@
         <htmlTabRef>run-oai-gnb-nr-ue</htmlTabRef>
         <htmlTabName>Run-gNB-and-NR-UE</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 090101 000001 090102 000002 090108 090109
 	</TestCaseRequestedList>
@@ -52,7 +52,7 @@
         <testCase id="090102">
                 <class>Initialize_OAI_UE</class>
                 <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --dlsch-parallel 4 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
         </testCase>
 

ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml

@@ -24,7 +24,7 @@
         <htmlTabRef>run-oai-gnb-nr-ue-tx-write-thread</htmlTabRef>
         <htmlTabName>Run-gNB-and-NR-UE-TX-Write-Thread</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 090103 000001 090104 000002 090108 090109
 	</TestCaseRequestedList>
@@ -52,7 +52,7 @@
         <testCase id="090104">
                 <class>Initialize_OAI_UE</class>
                 <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75  --rrc_config_path . --dlsch-parallel 4 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75  --rrc_config_path . --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
         </testCase>
 

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>gnb-build-tab</htmlTabRef>
 	<htmlTabName>Build-gNB</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 010101
 	</TestCaseRequestedList>
@@ -34,7 +34,7 @@
 		<mode>TesteNB</mode>	
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
-		<Build_eNB_args>--gNB -w USRP --ninja --cmake-opt -DBoost_INCLUDE_DIR=/usr/include/boost169 --noavx512</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja --cmake-opt -DBoost_INCLUDE_DIR=/usr/include/boost169 --noavx512 -c -P</Build_eNB_args>
 		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 

ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10</htmlTabRef>
 	<htmlTabName>Test-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040612</TestMinId>
 	<TestCaseRequestedList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-20</htmlTabRef>
 	<htmlTabName>Test-20MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-oai-ue</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-OAI-UE</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030102 000001 090102 000002 040503 000002 040603 040604 040643 040644 000002 090109 000001 030201

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201

ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
 	<htmlTabName>Test-X2-Handover-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  040101 030201 030202
  050102

ci-scripts/xml_files/ldpc_gpu_test.xml

@@ -26,132 +26,125 @@
 	<htmlTabName>Test-ldpc-GPU</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>000001 000002 000003 000004 000005 000006 000007 000008 000009 000010 000011 000012 000013 000014 000015 000016 000017 000018 000019 000020 000021</TestCaseRequestedList>
+	<TestCaseRequestedList>000002 000003 000004 000005 000006 000007 000008 000009 000010 000011 000012 000013 000014 000015 000016 000017 000018 000019 000020 000021</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="000001">
-		<class>Build_PhySim</class>
-		<desc>Build for physical simulator</desc>
-		<physim_build_args>--phy_simulators --ninja --noavx512</physim_build_args>
-		<forced_workspace_cleanup>FALSE</forced_workspace_cleanup>
-	</testCase>
-
 	<testCase id="000002">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 3872 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000003">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 3872 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000004">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4224 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000005">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4224 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000006">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4576 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000007">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4576 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000008">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4928 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000009">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4928 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000010">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 5280 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000011">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 5280 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000012">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 5632 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000013">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 5632 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000014">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 6336 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000015">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 6336 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000016">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 7040 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000017">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 7040 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000018">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 7744 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000019">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 7744 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000020">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 8448 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000021">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 8448 -s10 -n100 -G 1</physim_run_args>
 	</testCase>

ci-scripts/xml_files/multi_rru_band38_test_10mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-multi-rru-10</htmlTabRef>
 	<htmlTabName>Test-Multi-RRU-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  030211 030212 030213
  030111 030112 030113

ci-scripts/xml_files/nr_ue_usrp_build.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>nr-ue-build-tab</htmlTabRef>
 	<htmlTabName>Build-NR-UE</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 010102
 	</TestCaseRequestedList>

ci-scripts/xml_files/physim_build_source.xml

@@ -0,0 +1,36 @@
+<!--
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+-->
+
+<testCaseList>
+  <htmlTabRef>build-offload</htmlTabRef>
+  <htmlTabName>Build physical simulators</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>000001</TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="000001">
+    <class>Build_PhySim</class>
+    <desc>Build physical simulators</desc>
+    <physim_build_args>--phy_simulators --ninja --noavx512</physim_build_args>
+    <forced_workspace_cleanup>FALSE</forced_workspace_cleanup>
+  </testCase>
+</testCaseList>

ci-scripts/xml_files/t1_offload_test.xml

@@ -0,0 +1,54 @@
+<!--
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+-->
+
+<testCaseList>
+	<htmlTabRef>test-t1-offload</htmlTabRef>
+	<htmlTabName>Test T1 Offload</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>000001 000002 000003 000004</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>Run_NRulsimTest</class>
+		<desc>Run T1 Offload nr_ulsim</desc>
+		<physim_run_args>-n2 -s30 -m9 -r50 -R106 -o</physim_run_args>
+	</testCase>
+
+	<testCase id="000002">
+		<class>Run_NRulsimTest</class>
+		<desc>Run T1 Offload nr_ulsim</desc>
+		<physim_run_args>-n2 -s30 -m9 -r106 -R106 -o</physim_run_args>
+	</testCase>
+
+	<testCase id="000003">
+		<class>Run_NRulsimTest</class>
+		<desc>Run T1 Offload nr_ulsim</desc>
+		<physim_run_args>-n2 -s30 -m16 -r106 -R106 -o</physim_run_args>
+	</testCase>
+
+	<testCase id="000004">
+		<class>Run_NRulsimTest</class>
+		<desc>Run T1 Offload nr_ulsim</desc>
+		<physim_run_args>-n2 -s30 -m9 -r273 -R273 -o</physim_run_args>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10mhz-orange</htmlTabRef>
 	<htmlTabName>Test-10Mhz-Orange</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>4</repeatCount>	
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  090109
  090110 000001 090109

ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10mHz-sfr</htmlTabRef>
 	<htmlTabName>Test-10MHz-SFR</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  090109
  090111 000001 090109

ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml

@@ -25,7 +25,7 @@
 	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
 	<htmlTabName>Test-X2-HO-FDD-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestCaseRequestedList>
  030201 030202

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -0,0 +1,305 @@
+version: '3.8'
+
+services:
+    cassandra:
+        image: cassandra:2.1
+        container_name: l2sim4g-cassandra
+        networks:
+            private_net:
+                ipv4_address: 192.168.68.2
+        environment:
+            CASSANDRA_CLUSTER_NAME: "OAI HSS Cluster"
+            CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
+        healthcheck:
+            test: /bin/bash -c "nodetool status"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    db_init:
+        image: cassandra:2.1
+        container_name: l2sim4g-db-init
+        depends_on: [cassandra]
+        deploy:
+            restart_policy:
+                condition: on-failure
+                max_attempts: 10
+        networks:
+            private_net:
+                ipv4_address: 192.168.68.4
+        volumes:
+            - ../4g_rfsimulator_fdd_05MHz/oai_db.cql:/home/oai_db.cql
+        entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
+
+    oai_hss:
+        image: oai-hss:latest
+        container_name: l2sim4g-oai-hss
+        privileged: true
+        depends_on: [cassandra]
+        networks:
+            private_net:
+                ipv4_address: 192.168.68.3
+            public_net:
+                ipv4_address: 192.168.61.2
+        environment:
+            REALM: openairinterface.org
+            HSS_FQDN: hss.openairinterface.org
+            PREFIX: /openair-hss/etc
+            cassandra_Server_IP: 192.168.68.2
+            OP_KEY: 1006020f0a478bf6b699f15c062e42b3
+            LTE_K: fec86ba6eb707ed08905757b1bb44b8f
+            APN1: oai.ipv4
+            APN2: internet
+            FIRST_IMSI: 208960100000001
+            NB_USERS: 10
+        healthcheck:
+            test: /bin/bash -c "pgrep oai_hss"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    redis:
+        image: redis:6.0.5
+        container_name: l2sim4g-redis
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.61.6
+        volumes:
+            - ../4g_rfsimulator_fdd_05MHz/redis_extern.conf:/usr/local/etc/redis/redis.conf
+        entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
+        healthcheck:
+            test: /bin/bash -c "redis-cli -h 192.168.61.6 -p 6380 ping"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    magma_mme:
+        image: magma-mme:latest
+        container_name: l2sim4g-magma-mme
+        hostname: mme
+        privileged: true
+        depends_on: [oai_hss, redis]
+        networks:
+            public_net:
+                ipv4_address: 192.168.61.3
+        environment:
+            TZ: Europe/Paris
+            REALM: openairinterface.org
+            PREFIX: /openair-mme/etc
+            HSS_HOSTNAME: hss
+            HSS_FQDN: hss.openairinterface.org
+            HSS_REALM: openairinterface.org
+            MME_FQDN: mme.openairinterface.org
+            FEATURES: mme_oai
+        volumes:
+            - ../4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
+            - ../4g_rfsimulator_fdd_05MHz/mme.conf:/magma-mme/etc/mme.conf
+            - ../4g_rfsimulator_fdd_05MHz/entrypoint.sh:/magma-mme/bin/entrypoint.sh
+        entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
+        healthcheck:
+            test: /bin/bash -c "pgrep oai_mme"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_spgwc:
+        image: oai-spgwc:latest
+        privileged: true
+        depends_on: [magma_mme]
+        container_name: l2sim4g-oai-spgwc
+        networks:
+            public_net:
+                ipv4_address: 192.168.61.4
+        environment:
+            TZ: Europe/Paris
+            SGW_INTERFACE_NAME_FOR_S11: eth0
+            PGW_INTERFACE_NAME_FOR_SX: eth0
+            DEFAULT_DNS_IPV4_ADDRESS: 172.21.3.100
+            DEFAULT_DNS_SEC_IPV4_ADDRESS: 8.8.4.4
+            PUSH_PROTOCOL_OPTION: 'true'
+            APN_NI_1: oai.ipv4
+            APN_NI_2: oai.ipv4_2
+            DEFAULT_APN_NI_1: oai.ipv4
+            UE_IP_ADDRESS_POOL_1: '12.0.0.2 - 12.0.0.254'
+            UE_IP_ADDRESS_POOL_2: '12.1.1.2 - 12.1.1.254'
+            MCC: '208'
+            MNC: '96'
+            MNC03: '096'
+            TAC: 1
+            GW_ID: 1
+            REALM: openairinterface.org
+        healthcheck:
+            test: /bin/bash -c "pgrep oai_spgwc"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_spgwu:
+        image: oai-spgwu-tiny:latest
+        privileged: true
+        container_name: l2sim4g-oai-spgwu-tiny
+        depends_on: [oai_spgwc]
+        networks:
+            public_net:
+                ipv4_address: 192.168.61.5
+        environment:
+            TZ: Europe/Paris
+            PID_DIRECTORY: /var/run
+            INSTANCE: 1
+            SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP: eth0
+            PGW_INTERFACE_NAME_FOR_SGI: eth0
+            SGW_INTERFACE_NAME_FOR_SX: eth0
+            SPGWC0_IP_ADDRESS: 192.168.61.4
+            NETWORK_UE_IP: '12.0.0.0/24'
+            NETWORK_UE_NAT_OPTION: 'yes'
+            MCC: '208'
+            MNC: '96'
+            MNC03: '096'
+            TAC: 1
+            GW_ID: 1
+            REALM: openairinterface.org
+        healthcheck:
+            test: /bin/bash -c "pgrep oai_spgwu"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    trf_gen:
+        image: trf-gen:production
+        privileged: true
+        container_name: l2sim4g-trf-gen
+        networks:
+            public_net:
+                ipv4_address: 192.168.61.11
+        entrypoint: /bin/bash -c "ip route add 12.0.0.0/24 via 192.168.61.5 dev eth0; sleep infinity"
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.61.5"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_enb:
+        image: oai-enb:develop
+        privileged: true
+        container_name: l2sim4g-oai-enb
+        network_mode: "host"
+        environment:
+            TZ: Europe/Paris
+            USE_NFAPI_VNF: 'yes'
+            ENB_NAME: enb-l2sim-vnf
+            MCC: '208'
+            MNC: '96'
+            MNC_LENGTH: 2
+            TAC: 1
+            UTRA_BAND_ID: 7
+            DL_FREQUENCY_IN_MHZ: 2680
+            UL_FREQUENCY_OFFSET_IN_MHZ: 120
+            NID_CELL: 10
+            NB_PRB: 25
+            MME_S1C_IP_ADDRESS: 192.168.61.3
+            ENB_INTERFACE_NAME_FOR_S1_MME: eth0
+            ENB_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.1
+            ENB_INTERFACE_NAME_FOR_S1U: eth0
+            ENB_IPV4_ADDRESS_FOR_S1U: 192.168.61.1
+            ENB_IPV4_ADDRESS_FOR_X2C: 192.168.61.1
+            FLEXRAN_ENABLED: 'no'
+            FLEXRAN_INTERFACE_NAME: eth0
+            FLEXRAN_IPV4_ADDRESS: 192.168.61.1
+            LOCAL_S_IF_NAME: 'lo:'
+            REMOTE_S_ADDRESS: 127.0.0.1
+            LOCAL_S_ADDRESS: 127.0.0.2
+            USE_ADDITIONAL_OPTIONS: --MACRLCs.[0].scheduler_mode "default" --log_config.global_log_options level,nocolor,time
+        healthcheck:
+            test: /bin/bash -c "pgrep lte-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    proxy:
+        image: oai-lte-multi-ue-proxy:latest
+        privileged: true
+        container_name: "l2sim4g-proxy"
+        network_mode: "host"
+        environment:
+            TZ: Europe/Paris
+        command: "/oai-lte-multi-ue-proxy/bin/proxy 1"
+        depends_on:
+            - oai_enb
+        healthcheck:
+            test: /bin/bash -c "pgrep proxy"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_ue1:
+        image: oai-lte-ue:develop
+        privileged: true
+        container_name: l2sim4g-oai-lte-ue1
+        network_mode: "host"
+        environment:
+            TZ: Europe/Paris
+            USE_NFAPI: 'yes'
+            OPENAIR_DIR: /opt/oai-nr-ue
+            MCC: '208'
+            MNC: '96'
+            SHORT_IMSI: '0100000001'
+            LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'c42449363bbad02b66d16bc975d77cc1'
+            MSISDN: '001011234561010'
+            HPLMN: 20896
+            UE_NFAPI_IF_NAME: eno1
+            ENB_IP_ADDRESS: 127.0.0.1
+            LTE_UE_IP_ADDRESS: 127.0.0.1
+            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --nokrnmod 1 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time
+        volumes:
+            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
+        healthcheck:
+            test: /bin/bash -c "pgrep lte-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_ue2:
+        image: oai-lte-ue:develop
+        privileged: true
+        container_name: l2sim4g-oai-lte-ue2
+        network_mode: "host"
+        environment:
+            TZ: Europe/Paris
+            USE_NFAPI: 'yes'
+            OPENAIR_DIR: /opt/oai-nr-ue
+            MCC: '208'
+            MNC: '96'
+            SHORT_IMSI: '0100000002'
+            LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'c42449363bbad02b66d16bc975d77cc1'
+            MSISDN: '001011234561010'
+            HPLMN: 20896
+            UE_NFAPI_IF_NAME: eno1
+            ENB_IP_ADDRESS: 127.0.0.1
+            LTE_UE_IP_ADDRESS: 127.0.0.1
+            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --nokrnmod 1 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time
+        volumes:
+            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
+        healthcheck:
+            test: /bin/bash -c "pgrep lte-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    private_net:
+        name: l2sim4g-oai-private-net
+        ipam:
+            config:
+                - subnet: 192.168.68.0/26
+        driver_opts:
+            com.docker.network.bridge.name: "l2sim4g-private"
+    public_net:
+        name: l2sim4g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.61.0/26
+        driver_opts:
+            com.docker.network.bridge.name: "l2sim4g-public"

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
     oai-nrf:
         container_name: "rfsim5g-oai-nrf"
-        image: oai-nrf:latest
+        image: oai-nrf:august-dev
         environment:
             - NRF_INTERFACE_NAME_FOR_SBI=eth0
             - NRF_INTERFACE_PORT_FOR_SBI=80
@@ -42,7 +42,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oai-amf:latest
+        image: oai-amf:august-dev
         environment:
             - TZ=Europe/paris
             - INSTANCE=0
@@ -63,9 +63,9 @@ services:
             - PLMN_SUPPORT_MNC=99
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
-            - SD_0=1
+            - SD_0=0xffffff
             - SST_1=1
-            - SD_1=12
+            - SD_1=1
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -110,7 +110,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oai-smf:latest
+        image: oai-smf:august-dev
         environment:
             - TZ=Europe/Paris
             - INSTANCE=0
@@ -140,6 +140,12 @@ services:
             - DISCOVER_UPF=yes
             - USE_FQDN_DNS=yes
             - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - NSSAI_SD0=0xFFFFFF
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
             - DNN_NI2=oai.ipv4
         depends_on:
             - oai-nrf
@@ -156,7 +162,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-spgwu:
         container_name: "rfsim5g-oai-spgwu"
-        image: oai-spgwu-tiny:latest
+        image: oai-spgwu-tiny:august-dev
         environment:
             - TZ=Europe/Paris
             - PID_DIRECTORY=/var/run
@@ -183,7 +189,7 @@ services:
             - NRF_API_VERSION=v1
             - NRF_FQDN=oai-nrf
             - NSSAI_SST_0=1
-            - NSSAI_SD_0=1
+            - NSSAI_SD_0=0xffffff
             - DNN_0=oai
         depends_on:
             - oai-nrf
@@ -237,8 +243,6 @@ services:
             MNC: '99'
             MNC_LENGTH: 2
             NSSAI_SST: 1
-            NSSAI_SD0: 1
-            NSSAI_SD1: 112233
             AMF_IP_ADDRESS: 192.168.71.132
             GNB_NGA_IF_NAME: eth0
             GNB_NGA_IP_ADDRESS: 192.168.71.140
@@ -273,8 +277,6 @@ services:
             MNC: '99'
             MNC_LENGTH: 2
             NSSAI_SST: 1
-            NSSAI_SD0: 1
-            NSSAI_SD1: 112233
             AMF_IP_ADDRESS: 192.168.71.132
             GNB_NGA_IF_NAME: eth0
             GNB_NGA_IP_ADDRESS: 192.168.71.142
@@ -307,7 +309,6 @@ services:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-du

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
     oai-nrf:
         container_name: "rfsim5g-oai-nrf"
-        image: oai-nrf:latest
+        image: oai-nrf:august-dev
         environment:
             - NRF_INTERFACE_NAME_FOR_SBI=eth0
             - NRF_INTERFACE_PORT_FOR_SBI=80
@@ -42,7 +42,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oai-amf:latest
+        image: oai-amf:august-dev
         environment:
             - TZ=Europe/paris
             - INSTANCE=0
@@ -63,9 +63,9 @@ services:
             - PLMN_SUPPORT_MNC=99
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
-            - SD_0=1
+            - SD_0=0xffffff
             - SST_1=1
-            - SD_1=12
+            - SD_1=1
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -110,7 +110,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oai-smf:latest
+        image: oai-smf:august-dev
         environment:
             - TZ=Europe/Paris
             - INSTANCE=0
@@ -140,6 +140,12 @@ services:
             - DISCOVER_UPF=yes
             - USE_FQDN_DNS=yes
             - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - NSSAI_SD0=0xFFFFFF
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
             - DNN_NI2=oai.ipv4
         depends_on:
             - oai-nrf
@@ -156,7 +162,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-spgwu:
         container_name: "rfsim5g-oai-spgwu"
-        image: oai-spgwu-tiny:latest
+        image: oai-spgwu-tiny:august-dev
         environment:
             - TZ=Europe/Paris
             - PID_DIRECTORY=/var/run
@@ -183,7 +189,7 @@ services:
             - NRF_API_VERSION=v1
             - NRF_FQDN=oai-nrf
             - NSSAI_SST_0=1
-            - NSSAI_SD_0=1
+            - NSSAI_SD_0=0xffffff
             - DNN_0=oai
         depends_on:
             - oai-nrf
@@ -237,8 +243,6 @@ services:
             MNC: '99'
             MNC_LENGTH: 2
             NSSAI_SST: 1
-            NSSAI_SD0: 1
-            NSSAI_SD1: 112233
             AMF_IP_ADDRESS: 192.168.71.132
             GNB_NGA_IF_NAME: eth0
             GNB_NGA_IP_ADDRESS: 192.168.71.140
@@ -266,7 +270,6 @@ services:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --band 66 -C 2169080000 --CO -400000000 -s 396 --nokrnmod --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb

ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
     oai-nrf:
         container_name: "l2sim-oai-nrf"
-        image: oai-nrf:latest
+        image: oai-nrf:august-dev
         environment:
             - NRF_INTERFACE_NAME_FOR_SBI=eth0
             - NRF_INTERFACE_PORT_FOR_SBI=80
@@ -42,7 +42,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "l2sim-oai-amf"
-        image: oai-amf:latest
+        image: oai-amf:august-dev
         environment:
             - TZ=Europe/paris
             - INSTANCE=0
@@ -63,9 +63,9 @@ services:
             - PLMN_SUPPORT_MNC=99
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
-            - SD_0=1
+            - SD_0=0xffffff
             - SST_1=1
-            - SD_1=12
+            - SD_1=1
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -110,7 +110,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "l2sim-oai-smf"
-        image: oai-smf:latest
+        image: oai-smf:august-dev
         environment:
             - TZ=Europe/Paris
             - INSTANCE=0
@@ -140,6 +140,12 @@ services:
             - DISCOVER_UPF=yes
             - USE_FQDN_DNS=yes
             - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - NSSAI_SD0=0xFFFFFF
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
             - DNN_NI2=oai.ipv4
         depends_on:
             - oai-nrf
@@ -156,7 +162,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-spgwu:
         container_name: "l2sim-oai-spgwu"
-        image: oai-spgwu-tiny:latest
+        image: oai-spgwu-tiny:august-dev
         environment:
             - TZ=Europe/Paris
             - PID_DIRECTORY=/var/run
@@ -183,7 +189,7 @@ services:
             - NRF_API_VERSION=v1
             - NRF_FQDN=oai-nrf
             - NSSAI_SST_0=1
-            - NSSAI_SD_0=1
+            - NSSAI_SD_0=0xffffff
             - DNN_0=oai
         depends_on:
             - oai-nrf
@@ -237,8 +243,6 @@ services:
             MNC: '99'
             MNC_LENGTH: 2
             NSSAI_SST: 1
-            NSSAI_SD0: 1
-            NSSAI_SD1: 112233
             AMF_IP_ADDRESS: 192.168.71.132
             GNB_NGA_IF_NAME: eno1
             GNB_NGA_IP_ADDRESS: 172.21.16.128
@@ -287,7 +291,7 @@ services:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
+            NSSAI_SD: 0xffffff
             NR_UE_NFAPI_IF_NAME: eno1
             GNB_IP_ADDRESS: 127.0.0.1
             NR_UE_IP_ADDRESS: 127.0.0.1

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -274,7 +274,6 @@ Create entry for Second UE in docker-compose.yaml file as follows:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
     oai-nrf:
         container_name: "rfsim5g-oai-nrf"
-        image: oai-nrf:latest
+        image: oai-nrf:august-dev
         environment:
             - NRF_INTERFACE_NAME_FOR_SBI=eth0
             - NRF_INTERFACE_PORT_FOR_SBI=80
@@ -42,7 +42,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oai-amf:latest
+        image: oai-amf:august-dev
         environment:
             - TZ=Europe/paris
             - INSTANCE=0
@@ -63,9 +63,9 @@ services:
             - PLMN_SUPPORT_MNC=99
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
-            - SD_0=1
+            - SD_0=0xffffff
             - SST_1=1
-            - SD_1=12
+            - SD_1=1
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -110,7 +110,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oai-smf:latest
+        image: oai-smf:august-dev
         environment:
             - TZ=Europe/Paris
             - INSTANCE=0
@@ -140,6 +140,12 @@ services:
             - DISCOVER_UPF=yes
             - USE_FQDN_DNS=yes
             - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - NSSAI_SD0=0xFFFFFF
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
             - DNN_NI2=oai.ipv4
         depends_on:
             - oai-nrf
@@ -156,7 +162,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-spgwu:
         container_name: "rfsim5g-oai-spgwu"
-        image: oai-spgwu-tiny:latest
+        image: oai-spgwu-tiny:august-dev
         environment:
             - TZ=Europe/Paris
             - PID_DIRECTORY=/var/run
@@ -183,7 +189,7 @@ services:
             - NRF_API_VERSION=v1
             - NRF_FQDN=oai-nrf
             - NSSAI_SST_0=1
-            - NSSAI_SD_0=1
+            - NSSAI_SD_0=0xffffff
             - DNN_0=oai
         depends_on:
             - oai-nrf
@@ -237,8 +243,6 @@ services:
             MNC: '99'
             MNC_LENGTH: 2
             NSSAI_SST: 1
-            NSSAI_SD0: 1
-            NSSAI_SD1: 112233
             AMF_IP_ADDRESS: 192.168.71.132
             GNB_NGA_IF_NAME: eth0
             GNB_NGA_IP_ADDRESS: 192.168.71.140
@@ -266,7 +270,6 @@ services:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -290,7 +293,6 @@ services:
             OPC: 'C42449363BBAD02B66D16BC975D77CC1'
             DNN: oai
             NSSAI_SST: 1
-            NSSAI_SD: 1
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb

cmake_targets/CMakeLists.txt

@@ -198,44 +198,36 @@ message("CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
 add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." Debug Release RelWithDebInfo MinSizeRel)
 
 Message("Architecture is ${CMAKE_SYSTEM_PROCESSOR}")
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
-  set(C_FLAGS_PROCESSOR "-gdwarf-2 -mfloat-abi=hard -mfpu=neon -lgcc -lrt")
-else (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
-  if(EXISTS  "/proc/cpuinfo")
-    file(STRINGS "/proc/cpuinfo" CPUINFO REGEX flags LIMIT_COUNT 1)
-    message("NOAVX512 is ${NOAVX512}")
-    if (CPUINFO MATCHES "avx512bw" AND "${NOAVX512}" STREQUAL "False")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512 " )
-      set(COMPILATION_AVX2 "True")
-    else()
-      if (CPUINFO MATCHES "avx2")
-        set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx2")
-        set(COMPILATION_AVX2 "True")
-      else()
-        set(COMPILATION_AVX2 "False")
-      endif()
-      if (CPUINFO MATCHES "sse4_1")
-        set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -msse4.1 -mpclmul")
-      endif()
-      if (CPUINFO MATCHES "ssse3")
-        set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mssse3")
-      endif()
-    endif()
-  else()
-    Message("/proc/cpuinfo does not exit. We will use manual CPU flags")
-  endif()
+# in case /proc/cpuinfo exists we want to inspect available Intrinsics
+# -so not to go always through SIMDE emulation
+# -so to avoid AVX512 instructions generation by gcc   
+if(EXISTS  "/proc/cpuinfo")
+   file(STRINGS "/proc/cpuinfo" CPUINFO REGEX flags LIMIT_COUNT 1)
+   message("AVX512 is ${AVX512}")
+   message("AVX2 is ${AVX2}")
+   if ("${AVX512}" STREQUAL "False")
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mno-avx512f")
+   else()
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512")   
+   endif()
+   if (CPUINFO MATCHES "avx2" AND "${AVX2}" STREQUAL "True")
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX2_NATIVE")
+   endif()
+   if (CPUINFO MATCHES "sse4_1")
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_1_NATIVE")
+   endif()
+   if (CPUINFO MATCHES "sse4_2")
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_2_NATIVE")
+   endif()
+   if (CPUINFO MATCHES "ssse3")
+      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
+   endif()
 endif()
 
-set(C_FLAGS_PROCESSOR " ${C_FLAGS_PROCESSOR} ${CFLAGS_PROCESSOR_USER}")
+set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -fno-var-tracking-assignments -march=native")
 
 Message("C_FLAGS_PROCESSOR is ${C_FLAGS_PROCESSOR}")
 
-#if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
-#  if ( (NOT( C_FLAGS_PROCESSOR MATCHES "ssse3")) OR (NOT( C_FLAGS_PROCESSOR MATCHES "msse4.1")) )
-#    Message(FATAL_ERROR "For x86 Architecture, you must have following flags: -mssse3 -msse4.1. The current detected flags are: ${C_FLAGS_PROCESSOR}. You can pass the flags manually in build script, for example: ./build_oai --cflags_processor \"-mssse3 -msse4.1 -mavx2\" ")
-#  endif()
-#endif()
-
 #
 # add autotools definitions that were maybe used!
 
@@ -334,13 +326,9 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 
 # Debug related options
 #########################################
-add_boolean_option(ASN_EMIT_DEBUG      False "ASN1 coder/decoder Debug")
-add_boolean_option(ASN_THREAD_SAFE     True "ASN1 coder/decoder Debug")
-add_boolean_option(MSG_PRINT           True "print debug messages")
+add_boolean_option(DEBUG_ASN1C      False "ASN1 coder/decoder Debug traces, see common/utils/config.h, the logs are regular OAI logs, in the log group 'ASN'")
 add_boolean_option(DISABLE_XER_PRINT   False "print XER Format")
 add_boolean_option(XER_PRINT           False "print XER Format")
-add_boolean_option(RRC_MSG_PRINT       False "print RRC messages")
-add_boolean_option(PDCP_MSG_PRINT      False "print PDCP messages to /tmp/pdcp.log")
 add_boolean_option(DEBUG_PDCP_PAYLOAD  False "print PDCP PDU to stdout")  # if true, make sure that global and PDCP log levels are trace
 add_boolean_option(DEBUG_MAC_INTERFACE False "print MAC-RLC PDU exchange to stdout") # if true, make sure that global and PDCP log levels are trace
 add_boolean_option(TRACE_RLC_PAYLOAD   False "print RLC PDU to stdout") # if true, make sure that global and PDCP log levels are trace
@@ -358,6 +346,12 @@ add_library(ITTI
   )
 add_dependencies(ITTI rrc_flag)
 
+# asn1c skeletons have hardcoded this flag to make customized debug logs
+# OAI uses this feature to re-use OAI LOG_I(ASN, ...)
+if (DEBUG_ASN1C)
+  add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -826,10 +820,32 @@ TARGET_LINK_LIBRARIES(benetel_5g pthread dl rt m numa)
 
 ##########################################################
 
-include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
+# LDPC offload library
+##########################################################
 
-Message("DEADLINE_SCHEDULER flag  is ${DEADLINE_SCHEDULER}")
-Message("CPU_Affinity flag is ${CPU_AFFINITY}")
+# there is no generic way to test for T1 Offload, it simply comes with the
+# shared object
+if (EXISTS "/usr/local/lib64/librte_pmd_hpac_sdfec_pmd.so")
+  set(T1_OFFLOAD_FOUND TRUE)
+else()
+  set(T1_OFFLOAD_FOUND FALSE)
+endif()
+
+if(T1_OFFLOAD_FOUND)
+  message(STATUS "T1 Offload support detected")
+  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib64/pkgconfig/")
+  pkg_search_module(LIBDPDK REQUIRED libdpdk=20.05.0)
+  add_library(ldpc_offload MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_offload PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_compile_options(ldpc_offload PRIVATE ${LIBDPDK_CFLAGS})
+  target_link_libraries(ldpc_offload ${LIBDPDK_LDFLAGS} rte_pmd_hpac_sdfec_pmd "-Wl,-rpath /usr/local/lib64")
+else()
+  message(STATUS "No T1 Offload support detected")
+endif ()
+
+##########################################################
+
+include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
 
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
@@ -845,7 +861,6 @@ add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION w
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
-add_boolean_option(ITTI_SIM                 False         "enable itti simulator")
 
 ########################
 # Include order
@@ -1215,6 +1230,7 @@ add_library(UTIL
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/backtrace.c
   ${OPENAIR_DIR}/common/utils/time_meas.c
+  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
 
 set(SECU_OSA_SRC
@@ -1685,14 +1701,8 @@ if (${SMBV})
   set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
 endif  (${SMBV})
 
-if (${COMPILATION_AVX2} STREQUAL "True")
-  #set(PHY_SRC ${PHY_SRC} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
-  set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
-endif ()
-
-if (${COMPILATION_AVX2} STREQUAL "True")
-  set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
-endif ()
+set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
 
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
 add_dependencies(PHY_COMMON rrc_flag)
@@ -1872,6 +1882,8 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/nr_rrc_common.c
   ${NR_RRC_DIR}/L2_nr_interface.c
+  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
+  ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
   ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_RRC_DIR}/rrc_gNB_nsa.c
   ${NR_RRC_DIR}/rrc_gNB_internode.c
@@ -1950,6 +1962,9 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/gNB_scheduler_uci.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_srs.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_RA.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
  )
 
 
@@ -2766,7 +2781,11 @@ target_link_libraries (nr-softmodem pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRA
 target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (nr-softmodem ${T_LIB})
 
-add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
+add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
+
+if(T1_OFFLOAD_FOUND)
+add_dependencies( nr-softmodem ldpc_offload)
+endif ()
 
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2794,16 +2813,14 @@ add_executable(nr-uesoftmodem
 
 target_link_libraries (nr-uesoftmodem
   -Wl,--start-group
-  RRC_LIB NR_RRC_LIB NGAP_LIB NGAP_GNB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_UE PHY_NR_UE PHY_RU NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
-  NFAPI_USER_LIB MISC_NFAPI_NR_LIB S1AP_LIB S1AP_ENB
-  ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ATLAS_LIBRARIES}
-  NFAPI_USER_LIB S1AP_LIB S1AP_ENB
-  ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB}
+  NR_RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
+  NFAPI_USER_LIB MISC_NFAPI_NR_LIB
+  ${RAL_LIB} ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB}
   -Wl,--end-group z dl)
 
 target_link_libraries (nr-uesoftmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (nr-uesoftmodem pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
+target_link_libraries (nr-uesoftmodem pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${XFORMS_LIBRARIES} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
 target_link_libraries (nr-uesoftmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (nr-uesoftmodem ${T_LIB})
 
@@ -2812,6 +2829,7 @@ if (CUDA_FOUND)
    add_dependencies( nr-uesoftmodem ldpc_cuda)
    add_dependencies( nr-softmodem ldpc_cuda)
 endif (CUDA_FOUND)
+
 ###################################"
 # Addexecutables for tests
 ####################################
@@ -2975,6 +2993,11 @@ add_executable(nr_ulsim
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
   )
+
+if(T1_OFFLOAD_FOUND)
+add_dependencies( nr_ulsim ldpc_offload)
+endif ()
+
 target_link_libraries(nr_ulsim
   -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN NGAP_GNB NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
@@ -3029,7 +3052,7 @@ if (${T_TRACER})
   foreach(i
         #all "add_executable" definitions (except tests, rb_tool, updatefw)
         lte-softmodem lte-uesoftmodem nr-softmodem
-        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7 nr-ittisim
+        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
         ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
         syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
         nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
@@ -3085,7 +3108,7 @@ function(make_driver name dir)
   endforeach()
   CONFIGURE_FILE(${OPENAIR_CMAKE}/tools/Kbuild.cmake ${OPENAIR_BIN_DIR}/${name}/Kbuild)
   add_custom_command(OUTPUT ${name}.ko
-    COMMAND make -j2 -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name}
+    COMMAND make -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name}
     WORKING_DIRECTORY ${OPENAIR_BIN_DIR}/${name}
     COMMENT "building ${module}.ko"
     VERBATIM
@@ -3115,50 +3138,6 @@ add_executable(rb_tool
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
 
-# nr-ittisim
-###################################################
-
-add_executable(nr-ittisim
-  ${rrc_h}
-  ${nr_rrc_h}
-  ${OPENAIR2_DIR}/GNB_APP/gnb_app.c
-  ${OPENAIR2_DIR}/GNB_APP/gnb_config.c
-  ${OPENAIR_DIR}/executables/nr-gnb.c
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR2_DIR}/SIMULATION/NR_RRC/itti_sim.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
-  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
-  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
-  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
-  ${OPENAIR2_DIR}/ENB_APP/flexran_agent_ran_api_to_fix.c
-  ${XFORMSINTERFACE_SOURCE}
-  ${T_SOURCE}
-  ${SHLIB_LOADER_SOURCES}
-  )
-
-target_link_libraries (nr-ittisim
-  -Wl,--start-group
-  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
-  ITTI ${FLPT_MSG_LIB} ${FLEXRAN_AGENT_LIB} ${RAL_LIB} ${NAS_SIM_LIB} RRC_LIB NR_RRC_LIB
-  NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
-  X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${FSPT_MSG_LIB}
-  PHY_NR_UE SCHED_NR_UE_LIB NR_L2_UE
-  -Wl,--end-group z dl)
-
-target_link_libraries (nr-ittisim ${LIBXML2_LIBRARIES})
-target_link_libraries (nr-ittisim pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
-target_link_libraries (nr-ittisim ${LIB_LMS_LIBRARIES})
-target_link_libraries (nr-ittisim ${T_LIB})
-
-add_dependencies( nr-ittisim ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
-
 # ???
 ####################
 list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)

cmake_targets/build_oai

@@ -55,7 +55,8 @@ BUILD_COVERITY_SCAN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-NOAVX512="False"
+AVX512="True"
+AVX2="True"
 BUILD_ECLIPSE=0
 NR="False"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope"
@@ -127,15 +128,13 @@ Options:
 -x | --xforms
    Will compile with software oscilloscope features
 --HWLAT
-    Makes test program for haw latency tests
+   Makes test program for haw latency tests
 --HWLAT_TEST
-  Compiles a hw latency test program
+   Compiles a hw latency test program
 --verbose-ci
-  Compile with verbose instructions in CI Docker env
+   Compile with verbose instructions in CI Docker env
 --verbose-compile
    Shows detailed compilation instructions in makefile
---cflags_processor
-   Manually Add CFLAGS of processor if they are not detected correctly by script. Only add these flags if you know your processor supports them. Example flags: -msse3 -msse4.1 -msse4.2 -mavx2
 --build-doxygen
    Builds doxygen based documentation.
 --build-coverity-scan
@@ -163,10 +162,10 @@ Options:
    Build eclipse project files.
 --build-lib <libraries>
    Build optional shared library, <libraries> can be one or several of $OPTIONAL_LIBRARIES or \"all\"
---usrp-recplay
-   Build for I/Q record-playback modes
 --noavx512
-   Build without AVX512 if it is present on CPU
+   Disable AVX512 intrinsics whatever processor capability is
+--noavx2
+   Disable AVX2 intrinsics if processor supports it or use SIMDE emulation
 -k | --skip-shared-libraries
    Skip build for shared libraries to reduce compilation time when building frequently for debugging purposes
 --ninja
@@ -177,8 +176,6 @@ Options:
   Enable the address sanitizer on all targets
 --sanitize-undefined | -fsanitize=undefined
   Enable the undefined behavior sanitizer on all targets
---ittiSIM
-  Makes the itti simulator
 -h | --help
    Print this help
 
@@ -363,10 +360,6 @@ function main() {
             VERBOSE_COMPILE=1
             echo_info "Will compile with verbose instructions"
             shift;;
-       --cflags_processor)
-            CMAKE_CMD="$CMAKE_CMD -DCFLAGS_PROCESSOR_USER=\"$2\""
-            echo_info "Setting CPU FLAGS from USER to: $2"
-            shift 2;;
        --build-doxygen)
 	        BUILD_DOXYGEN=1
             echo_info "Will build doxygen support"
@@ -444,8 +437,12 @@ function main() {
             fi
             shift 2;;		
         --noavx512)
-            NOAVX512="True"
-            echo_info "Disabling AVX512"
+            AVX512="False"
+            echo_info "Disabling AVX512 instructions"
+            shift 1;;
+        --noavx2)
+            AVX2="False"
+            echo_info "Disabling AVX2 instructions"
             shift 1;;
         -k | --skip-shared-libraries)
             SKIP_SHARED_LIB_FLAG="True"
@@ -465,11 +462,6 @@ function main() {
         --sanitize-undefined | -fundefined=address)
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_UNDEFINED=True"
             shift;;
-        --ittiSIM)
-            ittiSIM=1
-            CMAKE_CMD="$CMAKE_CMD -DITTI_SIM=True"
-            echo_info "Will compile itti simulator"
-            shift;;
         -h | --help)
             print_help
             exit 1;;
@@ -623,9 +615,6 @@ function main() {
   if [ "$nrUE" = 1 ] ; then
       execlist="$execlist nr-uesoftmodem"
   fi
-  if [ "$ittiSIM" = "1" ] ; then
-      execlist="$execlist nr-ittisim"
-  fi
 
   if [[ "$execlist" == "" && "$SIMUS_PHY" != "1" ]]; then
     echo_success "installing dependencies successful"
@@ -642,7 +631,7 @@ function main() {
   cd  $DIR/$BUILD_DIR/build
   if [[ ${#CMAKE_C_FLAGS[@]} > 0 ]]; then CMAKE_CMD="$CMAKE_CMD -DCMAKE_C_FLAGS=\"${CMAKE_C_FLAGS[*]}\""; fi
   if [[ ${#CMAKE_CXX_FLAGS[@]} > 0 ]]; then CMAKE_CMD="$CMAKE_CMD -DCMAKE_CXX_FLAGS=\"${CMAKE_CXX_FLAGS[*]}\""; fi
-  CMAKE_CMD="$CMAKE_CMD -DNOAVX512=\"${NOAVX512[*]}\""
+  CMAKE_CMD="$CMAKE_CMD -DAVX512=\"${AVX512[*]}\" -DAVX2=\"${AVX2[*]}\""
   echo_info "running $CMAKE_CMD"
   eval $CMAKE_CMD ../..
   

cmake_targets/tools/build_helper

@@ -122,6 +122,7 @@ check_supported_distribution() {
         "rhel8.6")     return 0 ;;
         "rhel8.7")     return 0 ;;
         "centos7")     return 0 ;;
+        "centos8")     return 0 ;;
     esac
     return 1
 }
@@ -237,8 +238,9 @@ compilations() {
      echo_error "$2 compilation failed"
      exit 1
   fi
-  if [ -s $3 ] ; then
-     cp $3 $4
+  if [ -s "$3" ] ; then
+     rm -f "$4"
+     ln -s "$PWD/$3" "$4"
      echo_success "$2 compiled"
      check_warnings "$dlog/$2.$REL.txt"
   else
@@ -873,6 +875,7 @@ check_install_oai_software() {
   fi
 
     install_asn1c_from_source $1
+    install_simde_from_source $1
 }
 
 install_asn1c_from_source(){
@@ -899,6 +902,15 @@ install_asn1c_from_source(){
     ) > $asn1_install_log 2>&1
 }
 
+install_simde_from_source(){
+    echo_info "\nInstalling SIMDE from source without test cases (header files only)"
+    $SUDO rm -rf /tmp/simde
+    git clone https://github.com/simd-everywhere/simde-no-tests.git /tmp/simde
+    cd /tmp/simde
+    # brute force copy into /usr/include
+    $SUDO \cp -rv ../simde /usr/include
+}
+
 #################################################
 # 2. compile
 ################################################