Update main

# Conflicts:
#	lib/rrc/ue/procedures/rrc_security_mode_command_procedure.cpp
#	lib/rrc/ue/procedures/rrc_security_mode_command_procedure.h
#	tests/e2e/tests/viavi/config.yml
#	tests/unittests/rrc/rrc_ue_smc_proc_test.cpp

Author: codebot

.github/workflows/docker.yml

@@ -13,61 +13,87 @@ jobs:
     strategy:
       matrix:
         include:
+          # --> metrics server
+          - TAGNAME: ""
+            REPOSITORY: metrics-server
+            EXTRA_CMAKE_ARGS: ""
+            ARCH: ""
+            PLATFORM: amd64
+            LIB: ""
+            LIB_VERSION: ""
+            DOCKERFILE: ./docker/grafana/Dockerfile
+            CONTEXT: ./docker/grafana
+          # --> grafana
+          - TAGNAME: ""
+            REPOSITORY: grafana
+            EXTRA_CMAKE_ARGS: ""
+            ARCH: ""
+            PLATFORM: amd64
+            LIB: ""
+            LIB_VERSION: ""
+            DOCKERFILE: ./docker/metrics_server/Dockerfile
+            CONTEXT: ./docker/metrics_server
           # --> split72
           # AMD AVX2
-          - SUFFIX: release_avx2
-            SPLIT: "split72"
+          - TAGNAME: split72_release_avx2
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
             ARCH: x86-64-v3
-            TAG: amd64-avx2
             PLATFORM: amd64
             LIB: dpdk
             LIB_VERSION: "23.11"
-          - SUFFIX: release_with_debug_avx2
-            SPLIT: "split72"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
+          - TAGNAME: split72_release_with_debug_avx2
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
             ARCH: x86-64-v3
-            TAG: amd64-avx2
             PLATFORM: amd64
             LIB: dpdk
             LIB_VERSION: "23.11"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
           # AMD AVX512
-          - SUFFIX: release_avx512
-            SPLIT: "split72"
+          - TAGNAME: split72_release_avx512
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
             ARCH: x86-64-v4
-            TAG: amd64-avx2-avx512
             PLATFORM: amd64
             LIB: dpdk
             LIB_VERSION: "23.11"
-          - SUFFIX: release_with_debug_avx512
-            SPLIT: "split72"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
+          - TAGNAME: split72_release_with_debug_avx512
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
             ARCH: x86-64-v4
-            TAG: amd64-avx2-avx512
             PLATFORM: amd64
             LIB: dpdk
             LIB_VERSION: "23.11"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
           # --> split8
           # AMD AVX2
-          - SUFFIX: release_avx2
-            SPLIT: "split8"
+          - TAGNAME: split8_release_avx2
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
             ARCH: x86-64-v3
-            TAG: amd64-avx2
             PLATFORM: amd64
             LIB: uhd
             LIB_VERSION: "4.6.0.0"
-          - SUFFIX: release_with_debug_avx2
-            SPLIT: "split8"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
+          - TAGNAME: split8_release_with_debug_avx2
+            REPOSITORY: srsran-project
             EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
             ARCH: x86-64-v3
-            TAG: amd64-avx2
             PLATFORM: amd64
             LIB: uhd
             LIB_VERSION: "4.6.0.0"
+            DOCKERFILE: ./docker/Dockerfile
+            CONTEXT: ./
     env:
-      NAME: srsran_${{ matrix.SPLIT }}_${{ matrix.SUFFIX }}
+      PREFIX: softwareradiosystems/${{ matrix.REPOSITORY }}:${{ matrix.TAGNAME }}
     environment: dockerhub
     steps:
       - name: Checkout code
@@ -83,18 +109,20 @@ jobs:
         id: tags
         run: |
           BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          DATE_TAG="${GITHUB_SHA:0:10}-$(date +'%Y-%m-%d')"
+          DATE_TAG="${GITHUB_SHA:0:10}__$(date +'%Y-%m-%d')"
           RELEASE_NAME="${{ github.event.release.name }}"
 
           if [ -n "$RELEASE_NAME" ]; then
-            tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:${RELEASE_NAME}"
+            tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-${RELEASE_NAME}"
           else
             if [ "$BRANCH_NAME" == "main" ]; then
-              tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:latest"
+              tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-latest"
             elif [ "$BRANCH_NAME" == "test" ]; then
-              tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:next"
+              tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-next"
             fi
           fi
+          tags="${tags//:-/:}"
+          echo "tags=$tags"
           echo "tags=$tags" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
@@ -110,10 +138,11 @@ jobs:
         with:
           push: true
           tags: ${{ steps.tags.outputs.tags }}
-          file: ./docker/Dockerfile
+          file: ${{ matrix.DOCKERFILE }}
           platforms: ${{ matrix.PLATFORM }}
+          context: ${{ matrix.CONTEXT }}
           build-args: |
-            NAME="srsran_${SPLIT}_${SUFFIX}"
+            NAME="${{ env.NAME }}"
             LIB=${{ matrix.LIB }}
             LIB_VERSION=${{ matrix.LIB_VERSION }}
             ARCH=${{ matrix.ARCH }}

.gitlab/ci/build.yml

@@ -325,9 +325,13 @@ variables:
         rm -Rf build_time_metrics.txt
       else
         mv ${CI_PROJECT_DIR}/build/apps/gnb/gnb /tmp/gnb
+        mv ${CI_PROJECT_DIR}/build/apps/cu/srscu /tmp/srscu
+        mv ${CI_PROJECT_DIR}/build/apps/du/srsdu /tmp/srsdu
         cd build
         make clean
         mv /tmp/gnb ${CI_PROJECT_DIR}/build/apps/gnb/gnb
+        mv /tmp/srscu ${CI_PROJECT_DIR}/build/apps/cu/srscu
+        mv /tmp/srsdu ${CI_PROJECT_DIR}/build/apps/du/srsdu
       fi
   timeout: 4h
   artifacts: &build_artifacts

.gitlab/ci/e2e.yml

@@ -368,6 +368,20 @@ amari 32UE memcheck:
     - *txrx-lib
     - *retina-needs
 
+amari 4 cudu:
+  extends: .zmq
+  variables:
+    TESTBED: zmq_cudu
+    MARKERS: "smoke"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
+    E2E_LOG_LEVEL: "info"
+  allow_failure: true
+  needs:
+    - job: "basic relwithdeb"
+      artifacts: true
+    - *txrx-lib
+    - *retina-needs
+
 ################################################################################
 # TEST MODE
 ################################################################################
@@ -546,11 +560,12 @@ viavi:
     matrix:
       - KEYWORDS: [
             "ideal and 1UE",
-            "ideal and 32UE",
+            "ideal and 32UE and not experimental",
             "fading and 1UE",
             # "fading and 32UE",
             "birth-death and 1UE",
             # "birth-death and 32UE",
+            "32UE and experimental",
           ]
 
 viavi-debug:

.gitlab/ci/e2e/.env

@@ -2,7 +2,7 @@ GNB_REMOTE_PATH=/usr/local/bin/gnb
 GNB_IS_EXECUTABLE=true
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.50.4
+RETINA_VERSION=0.50.9
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

.gitlab/ci/e2e/retina_request_zmq_cudu.yml

@@ -0,0 +1,79 @@
+#
+# Copyright 2013-2024 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
+# the distribution.
+#
+
+- name: amarisoft-ue
+  type: ue
+  image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
+  nof_ports: 32
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 5
+      limits: 5
+    memory:
+      requests: "26G"
+      limits: "26G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: zmq
+    - type: license
+      model: amarisoft-5g
+  shared_files:
+    - local_path: ${AMARISOFT_TXRX_BINARY_PATH}
+      remote_path: /opt/lteue/trx_srsran.so
+      is_executable: true
+
+- name: srs-gnb
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srscudu:${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 5
+      limits: 5
+    memory:
+      requests: "26G"
+      limits: "26G"
+    ephemeral-storage:
+      requests: "15G"
+      limits: "15G"
+  resources:
+    - type: zmq
+  shared_files:
+    - local_path: ${GNB_BINARY_PATH}
+      remote_path: ${GNB_REMOTE_PATH}
+      is_executable: ${GNB_IS_EXECUTABLE}
+    - local_path: ../../build/apps/cu/srscu
+      remote_path: /usr/local/bin/srscu
+      is_executable: true
+    - local_path: ../../build/apps/du/srsdu
+      remote_path: /usr/local/bin/srsdu
+      is_executable: true
+
+- name: open5gs
+  type: 5gc
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+      limits: 1
+    memory:
+      requests: "8G"
+      limits: "8G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}