Update main

# Conflicts:
#	lib/ofh/compression/packing_utils_avx2.cpp
#	lib/ofh/compression/packing_utils_avx512.cpp
#	lib/ofh/compression/packing_utils_neon.cpp

.gitlab-ci.yml

@@ -160,6 +160,7 @@ full-code-format:
     KUBERNETES_CPU_LIMIT: 6
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 12Gi
+    CHECK_PER_FILE_TIMEOUT: 600
   before_script:
     - |
       echo "
@@ -180,7 +181,21 @@ full-code-format:
       cd build || exit
       cmake -DASSERT_LEVEL=PARANOID -DAUTO_DETECT_ISA=False -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
       make srsran_build_info # needed to generate hashes.h
+    - |
+      monitor_child_process() {
+          while true; do
+              ps -eo comm,pid,etimes | grep ${ANALYZER} | while read comm pid etimes; do
+                  if [ $etimes -gt $CHECK_PER_FILE_TIMEOUT ]; then
+                      echo "Killing child analysis process"
+                      kill $pid
+                  fi
+              done
+              sleep 30
+          done
+      }
+      export -f monitor_child_process
   script:
+    - nohup bash -c monitor_child_process &
     - static-analyzer.sh -i /tmp/codechecker_skip --jobs ${KUBERNETES_CPU_REQUEST} --analyzers ${ANALYZER} ${ANALYZER_ARGS} $CI_PROJECT_DIR
   after_script:
     - mv codechecker_html codechecker-${ANALYZER}-html
@@ -191,7 +206,6 @@ full-code-format:
       - codechecker-${ANALYZER}-html${ARTIFACT_EXTRA_PATH}
     when: always
     expire_in: 10 minutes
-  timeout: 8 hours # clangsa is slow
 
 clang-tidy:
   extends: .codechecker
@@ -211,6 +225,7 @@ cppcheck:
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
   interruptible: false
+  retry: 2
   variables:
     ANALYZER: cppcheck
     ANALYZER_ARGS: --cppcheck-max-template-recursion 5
@@ -231,6 +246,7 @@ clangsa:
   variables:
     ANALYZER: clangsa
     ANALYZER_ARGS: --ctu
+  timeout: 8 hours
 
 .coverity_base:
   image: $CR_REGISTRY_URI/coverity_image/2022.6.0:1.0.0
@@ -452,7 +468,7 @@ disable current schedule:
     - if: $CI_DESCRIPTION =~ /Alternative OSs/
       when: always
     - if: $CI_DESCRIPTION =~ /Weekly/
-      when: always                  
+      when: always
   interruptible: false
   variables:
     ENABLE: "false"

.gitlab/ci/build.yml

@@ -8,7 +8,7 @@
 
 include:
   - project: softwareradiosystems/ci/srsran_project_packaging
-    ref: "3"
+    ref: "4"
     file: .gitlab/ci-shared/package.yml
   - local: .gitlab/ci/src_cache.yml
 
@@ -17,7 +17,9 @@ variables:
   AMD64_AVX2_TAG: amd64-avx2
   AMD64_AVX512_TAG: amd64-avx2-avx512
   ARM64_TAG: arm64
+
   AMD64_LIB_BUILDER_TAG: on-prem-amd64
+  AMD64_VIAVI_BUILDER_TAG: on-prem-amd64-avx2-avx512
 
   INFRASTRUCTURE_TAG:
     description: Computer architecture and supported instruction sets
@@ -632,7 +634,7 @@ smoke release update cache:
     - *cache_build_set
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 smoke relwithdeb update cache:
   extends: .smoke relwithdeb
@@ -709,7 +711,7 @@ smoke valgrind update cache:
     SAVE_ARTIFACTS: "True" # Valgrind generates extra files
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 smoke asan:
   extends: .build_and_unit
@@ -739,7 +741,7 @@ package:
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
       when: delayed
       start_in: 30 minutes
-  variables:
+  variables: &package_variables
     PROJECT_NAME: srsran-project
     RELEASE_VERSION: "99.9"
     KUBERNETES_CPU_REQUEST: 7
@@ -1716,7 +1718,20 @@ basic relwithdeb:
     SAVE_ARTIFACTS: "True"
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
+
+basic package:
+  extends: .deb-package
+  stage: build and unit tests
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+  retry: 2
+  interruptible: false
+  variables:
+    <<: *package_variables
+    OS_VERSION: "24.04"
+  tags: ["${AMD64_LIB_BUILDER_TAG}"]
+  needs: []
 
 basic tsan:
   extends: .smoke tsan
@@ -1729,7 +1744,7 @@ basic tsan:
     SAVE_ARTIFACTS: "True"
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 basic asan:
   extends: smoke asan
@@ -1743,7 +1758,7 @@ basic asan:
   tags: ["${AMD64_AVX2_TAG}"]
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 basic memcheck:
   extends: .smoke valgrind
@@ -1756,7 +1771,7 @@ basic memcheck:
     SAVE_ARTIFACTS: "True"
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 basic avx512 dpdk:
   extends: .build_and_unit
@@ -1783,10 +1798,10 @@ basic avx512 dpdk:
     KUBERNETES_CPU_LIMIT: 14
     KUBERNETES_MEMORY_REQUEST: 20Gi
     KUBERNETES_MEMORY_LIMIT: 20Gi
-  tags: ["on-prem-amd64-avx2-avx512"]
+  tags: ["${AMD64_VIAVI_BUILDER_TAG}"]
   artifacts:
     <<: *build_artifacts
-    expire_in: 1 day
+    expire_in: 3 day
 
 #######
 # Web #

.gitlab/ci/e2e.yml

@@ -16,6 +16,7 @@ variables:
     description: Retina Testbed Description
     options:
       - "zmq"
+      - "zmq_deb"
       - "zmq_single_ue"
       - "zmq_4x4_mimo"
       - "zmq_srsue"
@@ -143,6 +144,7 @@ e2e request validation:
     - retina-delete-orchestration-network --user-name ^ci_${GROUP} --regex
     # Add extra secret env variables to the .env file
     - |
+      echo "" >> .gitlab/ci/e2e/.env
       cat $RETINA_SECRET_ENV >> .gitlab/ci/e2e/.env
     # Set username for retina
     - |
@@ -235,7 +237,7 @@ amari 1UE:
     TESTBED: "zmq_single_ue"
     MARKERS: "zmq_single_ue"
     E2E_LOG_LEVEL: "info"
-    RETINA_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True"
+    RETINA_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=True"
   needs:
     - job: "basic relwithdeb"
       artifacts: true
@@ -254,26 +256,48 @@ amari 1UE 4x4 mimo:
     - *txrx-lib
     - *retina-needs
 
+amari 4UE deb:
+  extends: .zmq
+  variables:
+    TESTBED: "zmq_deb"
+    MARKERS: "smoke"
+    E2E_LOG_LEVEL: "info"
+  needs:
+    - job: "basic package"
+      artifacts: true
+    - *txrx-lib
+    - *retina-needs
+
 amari 32UE:
   extends: .zmq
   variables:
     MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
+    RETINA_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False"
   needs:
     - job: "basic relwithdeb"
       artifacts: true
     - *txrx-lib
     - *retina-needs
   parallel:
     matrix:
-      - KEYWORDS: ["attach_detach", "ping", "iperf and udp", "iperf and tcp"]
+      - KEYWORDS:
+          [
+            "attach_detach",
+            "ping",
+            "iperf and udp and band:3",
+            "iperf and udp and not band:3",
+            "iperf and tcp and band:3",
+            "iperf and tcp and not band:3",
+          ]
 
 amari 32UE [reestablishment]:
   extends: .zmq
   variables:
     MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
     KEYWORDS: reestablishment
+    RETINA_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=False"
   allow_failure: true
   needs:
     - job: "basic relwithdeb"
@@ -431,8 +455,6 @@ test mode ru memcheck:
 
 amari b200 asan:
   extends: .rf
-  when: manual
-  allow_failure: true
   variables:
     MARKERS: "rf_not_crash"
   needs:
@@ -442,15 +464,11 @@ amari b200 asan:
 
 validate b200 config:
   extends: .rf
-  when: manual
-  allow_failure: true
   variables:
     MARKERS: "rf_b200"
 
 validate n300 config:
   extends: .rf
-  when: manual
-  allow_failure: true
   variables:
     MARKERS: "rf_n300"
     TESTBED: "android_n300"
@@ -476,8 +494,6 @@ android b200:
 android x300:
   stage: rf
   extends: .e2e-run
-  when: manual
-  allow_failure: true
   variables:
     GROUP: "rf"
     TESTBED: "android_x300"

.gitlab/ci/e2e/.env

@@ -1,9 +1,12 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.43.0
-AMARISOFT_VERSION=2023-03-17
+RETINA_VERSION=0.44.2
+UBUNTU_VERSION=24.04
+AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11
-OPEN5GS_VERSION=2.6.1
+OPEN5GS_VERSION=2.6.6
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-METRICS_SERVER_VERSION=1.5.2
+METRICS_SERVER_VERSION=1.7.0
 DPDK_VERSION=23.11
+ZMQ_HOSTLABEL_0=kubernetes.io/hostname=k8s-worker-vm2
+ZMQ_HOSTLABEL_1=kubernetes.io/hostname=k8s-worker-vm2

.gitlab/ci/e2e/retina_request_test_mode.yml

@@ -9,6 +9,8 @@
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_0}
   requirements:
     arch: amd64
     cpu:
@@ -41,3 +43,5 @@
       requests: "6G"
       limits: "6G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_0}

.gitlab/ci/e2e/retina_request_zmq.yml

@@ -9,6 +9,8 @@
 - name: amarisoft-ue
   type: ue
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
   nof_ports: 32
   requirements:
     arch: amd64
@@ -31,6 +33,8 @@
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
   requirements:
     arch: amd64
     cpu:
@@ -62,3 +66,5 @@
       requests: "6G"
       limits: "6G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}

.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml

@@ -9,6 +9,8 @@
 - name: amarisoft-ue
   type: ue
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
   requirements:
     arch: amd64
     cpu:
@@ -31,6 +33,8 @@
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
   requirements:
     arch: amd64
     cpu:
@@ -63,3 +67,5 @@
       requests: "6G"
       limits: "6G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}