Update main

# Conflicts: # lib/ran/gnb_format.h
srsran · Jul 12, 2024 · b136a43 · b136a43
2 parents 374ddb5 + 99d1742
commit b136a43
Show file tree

Hide file tree

Showing 216 changed files with 4,644 additions and 2,599 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -36,6 +36,9 @@ include:
   - project: softwareradiosystems/ci/tools
     ref: "20"
     file: .gitlab/ci-shared/tools/test_reporter.yml
+  - project: softwareradiosystems/ci/tools
+    ref: "20"
+    file: .gitlab/ci-shared/tools/tagger.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/build.yml
   - local: .gitlab/ci/trx.yml
@@ -281,6 +284,7 @@ clangsa:
   tags:
     - ${AMD64_TAG}
   interruptible: false
+  timeout: 2 hours
   script:
     - |
       mkdir -p build
@@ -457,13 +461,28 @@ pages:
 # Release dryrun
 ################################################################################
 update agpl main dryrun:
-  extends: .update agpl main
+  extends: update private branch
   stage: .post
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
       when: always
-      variables:
-        MODE: "dryrun"
+  variables:
+    PRIVATE_BRANCH: agpl_main
+    HEADERS: "true"
+    MODE: "dryrun"
+  needs: []
+
+create-tags:
+  extends: .create-tag
+  stage: .post
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      when: always
+  script:
+    - |
+      for name in $TAG_NAME_ARRAY; do
+        create_tag "${name}_$(date -u +"%Y.%m.%d")"
+      done
   needs: []
 
 ################################################################################

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -133,6 +133,16 @@ variables:
       artifacts: false
   before_script:
     - !reference [.fetch_src_cache, script]
+    - |
+      # Print build parameters
+      echo "INFRASTRUCTURE_TAG=${INFRASTRUCTURE_TAG}"
+      echo "OS=${OS}"
+      echo "COMPILER=${COMPILER}"
+      echo "TEST_MODE=${TEST_MODE}"
+      echo "BUILD_ARGS=${BUILD_ARGS}"
+      echo "MAKE_ARGS=${MAKE_ARGS}"
+      echo "UHD_VERSION=${UHD_VERSION}"
+      echo "DPDK_VERSION=${DPDK_VERSION}"
     - |
       build_srsgnb() {
         start_time=$(date +%s)
@@ -196,7 +206,7 @@ variables:
 
         if [ -n "${DPDK_VERSION}" ]; then
           BUILD_CMD="-d ${DPDK_VERSION} ${BUILD_CMD}"
-          export LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
+          export LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/:/opt/dpdk/${DPDK_VERSION}/lib/aarch64-linux-gnu/:${LD_LIBRARY_PATH}
         fi
         if [ -n "${UHD_VERSION}" ]; then
           BUILD_CMD="-u ${UHD_VERSION} ${BUILD_CMD}"
@@ -333,7 +343,7 @@ variables:
         mv /tmp/srscu ${CI_PROJECT_DIR}/build/apps/cu/srscu
         mv /tmp/srsdu ${CI_PROJECT_DIR}/build/apps/du/srsdu
       fi
-  timeout: 4h
+  timeout: 6h
   artifacts: &build_artifacts
     when: always
     reports:

diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
@@ -277,11 +277,8 @@ grafana server image latest:
       changes:
         <<: *srs_container_changes
       variables:
-        MODE: build
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
       interruptible: false
-      variables:
-        MODE: publish
   variables:
     KUBERNETES_CPU_REQUEST: 6
     KUBERNETES_CPU_LIMIT: 6
@@ -290,13 +287,14 @@ grafana server image latest:
     REGISTRY_URI: $GITLAB_REGISTRY_URI
     CONTEXT: ${CI_PROJECT_DIR}
     DOCKERFILE: docker
-    VERSION: latest
-    OVERWRITE: "true"
+    MODE: build
+  timeout: 2 hours
   tags:
     - ${TAG}
   before_script:
     - |
-      export NAME="srsran_${SPLIT}_${SUFFIX}"
+      export NAME="srsran-project"
+      export VERSION="${SPLIT}_${SUFFIX}"
       export BUILD_ARGS="LIB=${LIB};LIB_VERSION=${LIB_VERSION};ARCH=${ARCH};NUM_CORES=${KUBERNETES_CPU_LIMIT};EXTRA_CMAKE_ARGS=\"${EXTRA_CMAKE_ARGS}\""
   needs:
     - job: gnb docker compose

diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -139,6 +139,15 @@ e2e request and config validation:
     reports:
       junit: tests/e2e/out.xml
   script:
+    - |
+      # Print E2E parameters
+      echo "TESTBED=${TESTBED}"
+      echo "MARKERS=${MARKERS}"
+      echo "KEYWORDS=${KEYWORDS}"
+      echo "PYTEST_ARGS=${PYTEST_ARGS}"
+      echo "RETINA_PARAM_ARGS=${RETINA_PARAM_ARGS}"
+      echo "RETINA_LAUNCHER_ARGS=${RETINA_LAUNCHER_ARGS}"
+      echo "E2E_LOG_LEVEL=${E2E_LOG_LEVEL}"
     # Clean LFS files
     - |
       while read -r line; do
@@ -151,11 +160,9 @@ e2e request and config validation:
     - |
       echo "" >> .gitlab/ci/e2e/.env
       cat $RETINA_CONFIG_ENV >> .gitlab/ci/e2e/.env
-
-      echo -e "\nGNB_BINARY_PATH=../../" >> .gitlab/ci/e2e/.env
-      echo -e "\nGNB_REMOTE_PATH=$CI_PROJECT_DIR" >> .gitlab/ci/e2e/.env
-      echo -e "\nis_executable=false" >> .gitlab/ci/e2e/.env
-
+    # Modify request to shared the complete folder with the gnb container
+    - |
+      yq -i '(.[] | select(.type == "gnb") | .shared_files) += [{"local_path": "../../", "remote_path": env(CI_PROJECT_DIR), "is_executable": false}]' ${CI_PROJECT_DIR}/.gitlab/ci/e2e/retina_request_${TESTBED}.yml
     # Set username for retina
     - |
       cd tests/e2e
@@ -368,19 +375,39 @@ amari 32UE memcheck:
     - *txrx-lib
     - *retina-needs
 
-amari 4 cudu:
+cudu amari 8UE:
   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"
+    MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
   allow_failure: true
   needs:
     - job: "basic relwithdeb"
       artifacts: true
     - *txrx-lib
     - *retina-needs
+  parallel:
+    matrix:
+      - KEYWORDS: ["reestablishment and sequentially"]
+
+cudu amari 32UE:
+  extends: .zmq
+  variables:
+    TESTBED: zmq_cudu
+    MARKERS: "zmq and not smoke"
+    E2E_LOG_LEVEL: "info"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
+  allow_failure: true
+  needs:
+    - job: "basic relwithdeb"
+      artifacts: true
+    - *txrx-lib
+    - *retina-needs
+  parallel:
+    matrix:
+      - KEYWORDS: ["ping", "iperf and tcp and not band:3 and bandwidth:50"]
 
 ################################################################################
 # TEST MODE

diff --git a/.gitlab/ci/e2e/.env b/.gitlab/ci/e2e/.env
@@ -1,8 +1,6 @@
-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.11
+RETINA_VERSION=0.51.5
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

diff --git a/.gitlab/ci/e2e/retina_request_android_b200.yml b/.gitlab/ci/e2e/retina_request_android_b200.yml
@@ -45,8 +45,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_android_n300.yml b/.gitlab/ci/e2e/retina_request_android_n300.yml
@@ -46,8 +46,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_android_x300.yml b/.gitlab/ci/e2e/retina_request_android_x300.yml
@@ -46,8 +46,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_rf_b200.yml b/.gitlab/ci/e2e/retina_request_rf_b200.yml
@@ -50,8 +50,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_test_mode.yml b/.gitlab/ci/e2e/retina_request_test_mode.yml
@@ -29,8 +29,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_viavi.yml b/.gitlab/ci/e2e/retina_request_viavi.yml
@@ -34,8 +34,8 @@
     - LD_LIBRARY_PATH: /opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: metrics-server
   type: generic
@@ -47,7 +47,7 @@
       requests: "500Mi"
     ephemeral-storage:
       requests: "1G"
-  taints: ["retina"]
+  labels: ["kubernetes.io/hostname=k8s-worker-uhd1"]
   environment:
     - URL: ${RETINA_METRICS_SERVER_URL}
     - ORG: ${RETINA_METRICS_SERVER_ORG}

diff --git a/.gitlab/ci/e2e/retina_request_zmq.yml b/.gitlab/ci/e2e/retina_request_zmq.yml
@@ -54,8 +54,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml b/.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml
@@ -57,8 +57,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_zmq_cudu.yml b/.gitlab/ci/e2e/retina_request_zmq_cudu.yml
@@ -51,9 +51,6 @@
   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

diff --git a/.gitlab/ci/e2e/retina_request_zmq_single_ue.yml b/.gitlab/ci/e2e/retina_request_zmq_single_ue.yml
@@ -53,8 +53,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc

diff --git a/.gitlab/ci/e2e/retina_request_zmq_srsue.yml b/.gitlab/ci/e2e/retina_request_zmq_srsue.yml
@@ -47,8 +47,8 @@
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:
     - local_path: ${GNB_BINARY_PATH}
-      remote_path: ${GNB_REMOTE_PATH}
-      is_executable: ${GNB_IS_EXECUTABLE}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
 
 - name: open5gs
   type: 5gc