Merge branch 'dev' into agpl_main

Author: andrepuschmann

.gdbinit

@@ -1,5 +1,5 @@
 #
-# Copyright 2013-2022 Software Radio Systems Limited
+# Copyright 2021-2023 Software Radio Systems Limited
 #
 # By using this file, you agree to the terms and conditions set
 # forth in the LICENSE file which can be found at the top level of

.gitlab-ci.yml

@@ -25,13 +25,13 @@
 
 include:
   - project: softwareradiosystems/testing-tools
-    ref: "45"
+    ref: "48"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/testing-tools
-    ref: "45"
+    ref: "48"
     file: .gitlab/ci-shared/features/all.yml
   - project: softwareradiosystems/testing-tools
-    ref: "45"
+    ref: "48"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/build.yml
   - local: .gitlab/ci/e2e.yml
@@ -43,6 +43,11 @@ stages:
   - e2e
   - documentation
 
+variables:
+  SLACK_CHANNEL_OK: "#ci_gnb"
+  SLACK_CHANNEL_FAIL: "#ci_gnb"
+  SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
+
 ################################################################################
 ## Static
 ################################################################################
@@ -224,6 +229,8 @@ unit coverage:
   image:
     name: $CR_REGISTRY_URI/testing-tools/report-generator:5.1.10
     entrypoint: ["/bin/sh", "-c"]
+  variables:
+    GIT_STRATEGY: none
   rules:
     - if: $ON_MR
       variables:
@@ -326,7 +333,7 @@ pages:
     - sed -i 's/commit_hash/'$CI_COMMIT_SHA'/' public/index.html
     - sed -i 's/zmq_job_id/'$( cat ./zmq/job.env  )'/' public/index.html
     - sed -i 's/zmq-tsan_job_id/'$( cat ./zmq-tsan/job.env  )'/' public/index.html
-    # - sed -i 's/zmq-asan_job_id/'$( cat ./zmq-asan/job.env  )'/' public/index.html
+    - sed -i 's/zmq-asan_job_id/'$( cat ./zmq-asan/job.env  )'/' public/index.html
     - sed -i 's/rf_job_id/'$( cat ./rf/job.env  )'/' public/index.html
 
   needs:
@@ -342,8 +349,8 @@ pages:
       artifacts: true
     - job: zmq-tsan
       artifacts: true
-    # - job: zmq-asan
-    #   artifacts: true
+    - job: zmq-asan
+      artifacts: true
     - job: rf
       artifacts: true
   artifacts:

.gitlab/ci/build.yml

@@ -20,7 +20,7 @@
 
 include:
   - project: softwareradiosystems/testing-tools
-    ref: "45"
+    ref: "48"
     file: .gitlab/ci-shared/setup/all.yml
 
 stages:
@@ -34,7 +34,7 @@ stages:
     - ${SRS_INFRASTRUCTURE_TAG}-${PLATFORM}
   stage: build and unit tests
   variables:
-    DOCKER_BUILDER_VERSION: "1.7.4"
+    DOCKER_BUILDER_VERSION: "1.7.7"
     # General
     OS: ubuntu-22.04
     # Build
@@ -105,6 +105,7 @@ stages:
         echo "${BUILD_CMD}"
         echo "============================================================================================="
         $BUILD_CMD
+        cd build && ninja install && cd ..
       }
     - |
       launch_tests() {
@@ -214,7 +215,7 @@ stages:
         COMPILER: gcc
         BUILD_TYPE: Release
         ENABLE_EXPORT: "True"
-      - OS: rhel8
+      - OS: rhel-8
         TEST_MODE: default
         COMPILER: gcc
         BUILD_TYPE: Release
@@ -413,36 +414,66 @@ build alt [archlinux-latest, amd64, RelWithDebInfo]:
     BUILD_TYPE: RelWithDebInfo
   cache: []
 
-build alt [rhel8, amd64, Debug]:
+build alt [rhel-8, amd64, Debug]:
   extends: .build_and_unit_alt
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly/
   variables:
-    OS: rhel8
+    OS: rhel-8
     PLATFORM: amd64
     BUILD_TYPE: Debug
   cache: []
 
-build alt [rhel8, amd64, Release]:
+build alt [rhel-8, amd64, Release]:
   extends: .build_and_unit_alt
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly/
   variables:
-    OS: rhel8
+    OS: rhel-8
     PLATFORM: amd64
     BUILD_TYPE: Release
   cache: []
 
-build alt [rhel8, amd64, RelWithDebInfo]:
+build alt [rhel-8, amd64, RelWithDebInfo]:
   extends: .build_and_unit_alt
   rules:
     - if: $CI_DESCRIPTION =~ /Weekly/
   variables:
-    OS: rhel8
+    OS: rhel-8
     PLATFORM: amd64
     BUILD_TYPE: RelWithDebInfo
   cache: []
 
+build alt [rhel-8, arm64, Debug]:
+  extends: .build_and_unit_alt
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+  variables:
+    OS: rhel-8
+    PLATFORM: arm64
+    BUILD_TYPE: Debug
+  cache: []
+
+build alt [rhel-8, arm64, Release]:
+  extends: .build_and_unit_alt
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+  variables:
+    OS: rhel-8
+    PLATFORM: arm64
+    BUILD_TYPE: Release
+  cache: []
+
+build alt [rhel-8, arm64, RelWithDebInfo]:
+  extends: .build_and_unit_alt
+  rules:
+    - if: $CI_DESCRIPTION =~ /Weekly/
+  variables:
+    OS: rhel-8
+    PLATFORM: arm64
+    BUILD_TYPE: RelWithDebInfo
+  cache: []
+
 # UHD
 
 build uhd alt:
@@ -563,20 +594,20 @@ avx2 [tsan, clean]:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
   cache: []
 
-# avx2 [asan]:
-#   extends: .avx
-#   rules:
-#     - if: $CI_DESCRIPTION =~ /Nightly/
-#   variables:
-#     OS: ubuntu-22.04
-#     TEST_MODE: asan
-#     COMPILER: gcc
-#     BUILD_TYPE: Debug
-#     ENABLE_ASAN: "True"
-#     ASSERT_LEVEL: PARANOID
-#     CPU_FLAG: "avx2"
-#     ENABLE_AVX512: "False"
-#     ENABLE_AVX2: "True"
+avx2 [asan]:
+  extends: .avx
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+  variables:
+    OS: ubuntu-22.04
+    TEST_MODE: asan
+    COMPILER: gcc
+    BUILD_TYPE: Debug
+    ENABLE_ASAN: "True"
+    ASSERT_LEVEL: PARANOID
+    CPU_FLAG: "avx2"
+    ENABLE_AVX512: "False"
+    ENABLE_AVX2: "True"
 
 avx512:
   extends: .avx
@@ -598,8 +629,12 @@ avx extended:
     matrix:
       - CPU_FLAG: ["avx2", "avx2-avx512"]
         AUTO_DETECT_ISA: ["True", "False"]
+        ENABLE_AVX2: "True"
         ENABLE_AVX512: ["True", "False"]
-        ENABLE_AVX2: ["True", "False"]
+      - CPU_FLAG: ["avx2", "avx2-avx512"]
+        AUTO_DETECT_ISA: ["True", "False"]
+        ENABLE_AVX2: "False"
+        ENABLE_AVX512: "False"
 
 # Custom
 

.gitlab/ci/e2e.yml

@@ -17,6 +17,10 @@
 # the LICENSE file in the top-level directory of this distribution
 # and at http://www.gnu.org/licenses/.
 #
+include:
+  - project: softwareradiosystems/testing-tools
+    ref: "48"
+    file: .gitlab/ci-shared/setup/all.yml
 
 .prepare_test:
   before_script:
@@ -28,19 +32,17 @@
 .e2e-run:
   stage: e2e
   resource_group: e2e
-  timeout: 4h
+  timeout: 6h
   interruptible: false
   image:
-    name: registry.gitlab.com/softwareradiosystems/retina/launcher/3.11-alpine:0.0.18
+    name: registry.gitlab.com/softwareradiosystems/retina/launcher/3.11-alpine:0.0.26
     entrypoint: ["/bin/sh", "-c"]
   variables:
     REQUEST: "" # Retina YAML request
-    LOG_LEVEL: "info"
     MARKERS: ""
-    ARGS: ""
-    FORCE_DOWNLOAD: "false"  # Download only failed tests by default
-    PCAP: "" # Disabled by default
-    FAIL_IF_INTERNAL_ERRORS: "true" # Enabled by default
+    PYTEST_ARGS: ""
+    RETINA_ARGS: ""
+    LOG_LEVEL: "info"
   tags:
     - on-prem-amd64
   extends:
@@ -57,12 +59,8 @@
   script:
     - |
       cd tests/e2e
-      export LOGNAME=$GITLAB_USER_LOGIN
-      export RETINA_LOGLEVEL="$LOG_LEVEL"
-      export RETINA_FORCE_DOWNLOAD_REPORT="$FORCE_DOWNLOAD"
-      export RETINA_PCAP_ENABLE="$PCAP"
-      export RETINA_FAIL_IF_INTERNAL_ERRORS="$FAIL_IF_INTERNAL_ERRORS"
-    - retina-launcher --retina-request ${REQUEST} --self-contained-html --html=./log/report.html --junitxml=out.xml "${ARGS}" -m "${MARKERS}" .
+      export LOGNAME=ci_$GITLAB_USER_LOGIN
+    - retina-launcher --retina-request ${REQUEST} --self-contained-html --html=./log/report.html --junitxml=out.xml "${PYTEST_ARGS}" -m "${MARKERS}" --register-parameter ue.all.log_level=$LOG_LEVEL gnb.all.log_level=$LOG_LEVEL "${RETINA_ARGS}"
   after_script:
     - |
       echo "*******************************************************************************************************************************"
@@ -81,10 +79,10 @@ smoke-zmq-tsan:
       allow_failure: false
   variables:
     REQUEST: "${CI_PROJECT_DIR}/.gitlab/ci/retina_request_zmq.yml"
-    MARKERS: "smoke and not tcp and not multiue"
-    ARGS: "-x"
+    MARKERS: "smoke and not tcp and multiue"
+    PYTEST_ARGS: "-x"
+    RETINA_ARGS: "gnb.all.pcap=True"
     LOG_LEVEL: "debug"
-    PCAP: "true"
   needs:
     - job: "avx2 [tsan, cached]"
       artifacts: true
@@ -102,13 +100,17 @@ zmq:
     - if: $CI_DESCRIPTION =~ /Nightly/
   variables:
     REQUEST: "${CI_PROJECT_DIR}/.gitlab/ci/retina_request_zmq.yml"
-    MARKERS: "zmq and not multiue"
+    MARKERS: "zmq and multiue and not smoke"
+    # PYTEST_ARGS: "-n 2"
+    LOG_LEVEL: "info"
   needs:
     - job: "avx2 [basic]"
       artifacts: true
 
 zmq-tsan:
   extends: zmq
+  variables:
+    PYTEST_ARGS: "-n 2"
   needs:
     - job: "avx2 [tsan, cached]"
       artifacts: true
@@ -120,26 +122,25 @@ zmq-tsan:
       artifacts: true
       optional: true
 
-# zmq-asan:
-#   extends: zmq
-#   needs:
-#     - job: "avx2 [asan]"
-#       artifacts: true
-
-zmq-multiue:
+zmq-asan:
   extends: zmq
   variables:
-    MARKERS: "zmq and multiue"
+    PYTEST_ARGS: "-n 2"
+  needs:
+    - job: "avx2 [asan]"
+      artifacts: true
 
 rf:
   extends: .e2e-run
   rules:
+    - if: $ON_MR
+      when: manual
+      allow_failure: true
     - if: $CI_DESCRIPTION =~ /Nightly/
   variables:
     REQUEST: "${CI_PROJECT_DIR}/.gitlab/ci/retina_request_rf.yml"
-    MARKERS: "rf and not tcp and not multiue"
-    LOG_LEVEL: "warning"
-    FAIL_IF_INTERNAL_ERRORS: ""
+    MARKERS: "rf and not tcp and multiue"
+    LOG_LEVEL: "info"
   needs:
     - job: "avx2 [basic]"
       artifacts: true

.gitlab/ci/retina_request_rf.yml

@@ -20,7 +20,8 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_97e143d_344d33aee_0.2.8
+  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2023-02-06_17b9ea2_220ca4502_0.2.13
+  debug-labels: [retina.cpu.high]
   resources:
     - type: sdr
       model: b200 
@@ -29,12 +30,14 @@
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.8
+  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.2_0.2.13
+  debug-labels: [retina.cpu.low]
   resources:
     - type: sdr
       model: b200 
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.4
+  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.10
+  debug-labels: [retina.cpu.low]

.gitlab/ci/retina_request_zmq.yml

@@ -20,19 +20,22 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_97e143d_344d33aee_0.2.8
+  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2023-02-06_17b9ea2_220ca4502_0.2.13
+  debug-labels: [retina.cpu.high]
   resources:
     - type: zmq
     - type: license
       model: amarisoft-5g
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.8
+  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.2_0.2.13
+  debug-labels: [retina.cpu.low]
   resources:
     - type: zmq
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.4
+  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.10
+  debug-labels: [retina.cpu.low]