Update main

# Conflicts: # lib/cu_cp/du_processor/du_setup_handler.h # lib/phy/upper/signal_processors/pucch/pucch_orthogonal_sequence.h # tests/unittests/phy/upper/channel_processors/pusch/pusch_demodulator_test_data.tar.gz
srsran · Jul 23, 2024 · e5a3ba2 · e5a3ba2
2 parents c4996c8 + 807e0b9
commit e5a3ba2
Show file tree

Hide file tree

Showing 182 changed files with 3,759 additions and 1,804 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -21,8 +21,8 @@ jobs:
             PLATFORM: amd64
             LIB: ""
             LIB_VERSION: ""
-            DOCKERFILE: ./docker/grafana/Dockerfile
-            CONTEXT: ./docker/grafana
+            DOCKERFILE: ./docker/metrics_server/Dockerfile
+            CONTEXT: ./docker/metrics_server
           # --> grafana
           - TAGNAME: ""
             REPOSITORY: grafana
@@ -31,8 +31,8 @@ jobs:
             PLATFORM: amd64
             LIB: ""
             LIB_VERSION: ""
-            DOCKERFILE: ./docker/metrics_server/Dockerfile
-            CONTEXT: ./docker/metrics_server
+            DOCKERFILE: ./docker/grafana/Dockerfile
+            CONTEXT: ./docker/grafana
           # --> split72
           # AMD AVX2
           - TAGNAME: split72_release_avx2

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -116,7 +116,6 @@ variables:
     # TEST
     TEST_EXECUTION_TIMEOUT: 0
     # CI
-    SAVE_ARTIFACTS: "" # Empty by default
     KUBERNETES_CPU_REQUEST: 6
     KUBERNETES_CPU_LIMIT: 6
     KUBERNETES_MEMORY_REQUEST: 12Gi
@@ -133,16 +132,6 @@ 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)
@@ -204,6 +193,15 @@ variables:
           BUILD_CMD="${BUILD_CMD} ${BUILD_ARGS}"
         fi
 
+        echo "INFRASTRUCTURE_TAG=${INFRASTRUCTURE_TAG}"
+        echo "OS=${OS}"
+        echo "COMPILER=${COMPILER}"
+        echo "TEST_MODE=${TEST_MODE}"
+        echo "BUILD_ARGS=${BUILD_CMD}"
+        echo "MAKE_ARGS=${MAKE_ARGS}"
+        echo "UHD_VERSION=${UHD_VERSION}"
+        echo "DPDK_VERSION=${DPDK_VERSION}"
+
         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/:/opt/dpdk/${DPDK_VERSION}/lib/aarch64-linux-gnu/:${LD_LIBRARY_PATH}
@@ -327,23 +325,22 @@ variables:
   script:
     - build_srsgnb
     - launch_tests
-  after_script:
+  timeout: 6h
+  cache:
+    - !reference [.fetch_src_cache, cache]
+
+.build_artifacts:
+  after_script: &build_after_script
     - mv ${CI_PROJECT_DIR}/build/coverage.xml      ${CI_PROJECT_DIR}/${CI_JOB_ID}_coverage.xml            || true
     - |
-      if [ -z "${SAVE_ARTIFACTS}" ]; then
-        rm -Rf ${CI_PROJECT_DIR}/build
-        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: 6h
+      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
   artifacts: &build_artifacts
     when: always
     reports:
@@ -355,8 +352,6 @@ variables:
       - build/
       - build_time_metrics.txt
     expire_in: 10 minutes
-  cache:
-    - !reference [.fetch_src_cache, cache]
 
 # Basic builds (MR and update cache on Nightly)
 
@@ -505,8 +500,10 @@ smoke relwithdeb cached:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
       when: never
     - if: $ON_MR
-  variables:
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
+  artifacts:
+    <<: *build_artifacts
   cache:
     - !reference [.fetch_src_cache, cache]
     - *cache_build_get
@@ -639,8 +636,10 @@ smoke relwithdeb clean:
   extends: .smoke relwithdeb
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
-  variables:
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
+  artifacts:
+    <<: *build_artifacts
 
 smoke tsan clean:
   extends: .smoke tsan
@@ -692,8 +691,6 @@ intermediate commits cached:
       when: never
     - if: $ON_MR
   timeout: 2 hour
-  variables:
-    SAVE_ARTIFACTS: "True"
   script:
     - git config advice.detachedHead false
     - git fetch origin --depth=20 $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
@@ -707,6 +704,10 @@ intermediate commits cached:
         build_srsgnb
       done
     - launch_tests
+  after_script:
+    - *build_after_script
+  artifacts:
+    <<: *build_artifacts
   cache:
     - !reference [.fetch_src_cache, cache]
     - *cache_build_get
@@ -727,7 +728,6 @@ valgrind changed tests:
     CLEAN_BUILD: "False"
     FINGERPRINT: "fingerprints.csv"
     TEST_EXECUTION_TIMEOUT: 20m
-    SAVE_ARTIFACTS: "True"
   script:
     - git config advice.detachedHead false
     - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME --depth 40
@@ -781,8 +781,8 @@ smoke release update cache:
       start_in: 30 minutes
   retry: 2
   interruptible: false
-  variables:
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
   cache:
     - !reference [.fetch_src_cache, cache]
     - *cache_build_set
@@ -1922,7 +1922,8 @@ basic relwithdeb:
   interruptible: false
   variables:
     TEST_MODE: none
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
   artifacts:
     <<: *build_artifacts
     expire_in: 3 day
@@ -1948,7 +1949,8 @@ basic tsan:
   interruptible: false
   variables:
     TEST_MODE: none
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
   artifacts:
     <<: *build_artifacts
     expire_in: 3 day
@@ -1961,9 +1963,10 @@ basic asan:
   interruptible: false
   variables:
     TEST_MODE: none
-    SAVE_ARTIFACTS: "True"
-    BUILD_ARGS: -DEXIT_TIMEOUT=15
+    BUILD_ARGS: -DCMAKE_CXX_FLAGS="-march=x86-64-v3" -DEXIT_TIMEOUT=15
   tags: ["${AMD64_AVX2_TAG}"]
+  after_script:
+    - *build_after_script
   artifacts:
     <<: *build_artifacts
     expire_in: 3 day
@@ -1976,7 +1979,8 @@ basic memcheck:
   interruptible: false
   variables:
     TEST_MODE: none
-    SAVE_ARTIFACTS: "True"
+  after_script:
+    - *build_after_script
   artifacts:
     <<: *build_artifacts
     expire_in: 3 day
@@ -2000,8 +2004,9 @@ basic avx512 dpdk:
     BUILD_ARGS: -DCMAKE_CXX_FLAGS="-march=x86-64-v4"
     FORCE_DEBUG_INFO: "True"
     ASSERT_LEVEL: MINIMAL
-    SAVE_ARTIFACTS: "True"
   tags: ["${AMD64_AVX512_TAG}"]
+  after_script:
+    - *build_after_script
   artifacts:
     <<: *build_artifacts
     expire_in: 3 day
@@ -2023,8 +2028,11 @@ custom build:
   variables:
     ENABLE_ZEROMQ: ""
     AUTO_DETECT_ISA: ""
-    SAVE_ARTIFACTS: "True"
   tags: ["${INFRASTRUCTURE_TAG}"]
+  after_script:
+    - *build_after_script
+  artifacts:
+    <<: *build_artifacts
   cache:
     - !reference [.fetch_src_cache, cache]
     - *cache_build_get
diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -326,7 +326,11 @@ amari 8UE:
   parallel:
     matrix:
       - KEYWORDS:
-          ["reestablishment and sequentially", "handover and sequentially"]
+          [
+            "attach_detach",
+            "reestablishment and sequentially",
+            "handover and sequentially",
+          ]
 
 amari 8UE beta:
   extends: amari 8UE
@@ -354,37 +358,38 @@ amari 32UE:
     matrix:
       - 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 asan:
+amari 4UE asan:
   extends: .zmq
   variables:
     MARKERS: "smoke"
+    KEYWORDS: "iperf"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
   needs:
     - job: "basic asan"
       artifacts: true
     - *txrx-lib
     - *retina-needs
 
-amari 32UE tsan:
+amari 4UE tsan:
   extends: .zmq
   variables:
     MARKERS: "smoke"
+    KEYWORDS: "iperf"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
   needs:
     - job: "basic tsan"
       artifacts: true
     - *txrx-lib
     - *retina-needs
 
-amari 32UE memcheck:
+amari 4UE memcheck:
   extends: .zmq
   variables:
     MARKERS: "zmq_valgrind"
@@ -602,6 +607,7 @@ viavi:
     - job: "basic avx512 dpdk"
       artifacts: true
     - *retina-needs
+  allow_failure: true
   parallel:
     matrix:
       - KEYWORDS: [
@@ -625,6 +631,7 @@ viavi-debug:
     KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.rlc_rb_type=srb"
     RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
+  allow_failure: true
   needs:
     - job: "basic avx512 dpdk withassert"
       artifacts: true

diff --git a/.gitlab/ci/e2e/.env b/.gitlab/ci/e2e/.env
@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.51.8
+RETINA_VERSION=0.51.10
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

diff --git a/.gitlab/ci/release.yml b/.gitlab/ci/release.yml
@@ -46,11 +46,14 @@ load release variables:
         echo "PUBLIC_REPO=softwareradiosystems/srsRAN_$KEY" >> repo.env
         echo "HEADERS=" >> repo.env
         echo "PUBLIC_BRANCH=main" >> repo.env
+        TOKEN_VAR_NAME="PUBLIC_${KEY}_TOKEN"
+        echo "PUBLIC_PUSH_TOKEN=${!TOKEN_VAR_NAME}" >> repo.env
       else
         echo "PRIVATE_BRANCH=agpl_main" >> repo.env
         echo "PUBLIC_NAME=srsRAN Project" >> repo.env
         echo "PUBLIC_REPO=srsran/srsRAN_Project" >> repo.env
         echo "HEADERS=true" >> repo.env
+        echo "PUBLIC_PUSH_TOKEN=$PUBLIC_TOKEN" >> repo.env
       fi
     - cat repo.env
   artifacts:
@@ -161,7 +164,7 @@ coverity-agpl:
     # Download private repo and add public as origin
     - git clone --branch $PRIVATE_BRANCH https://${CODEBOT_USERNAME}:${CODEBOT_TOKEN}@gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git /${CI_PROJECT_NAME}
     - cd /${CI_PROJECT_NAME}
-    - git remote add github_public https://${PUBLIC_TOKEN}@github.com/${PUBLIC_REPO}.git
+    - git remote add github_public https://${PUBLIC_PUSH_TOKEN}@github.com/${PUBLIC_REPO}.git
     # Push code to public repo
     - git push github_public ${PRIVATE_BRANCH}:${PUBLIC_BRANCH}
 
@@ -264,7 +267,7 @@ release public:
     - export PUBLIC_RELEASE_NOTES=${CI_COMMIT_TAG_MESSAGE}
 
     # Download public repo
-    - git clone --branch $PUBLIC_BRANCH https://${PUBLIC_TOKEN}@github.com/${PUBLIC_REPO}.git srsran
+    - git clone --branch $PUBLIC_BRANCH https://${PUBLIC_PUSH_TOKEN}@github.com/${PUBLIC_REPO}.git srsran
     - cd srsran
 
     # Push tag
@@ -276,7 +279,7 @@ release public:
       RELEASE_ID=$(curl -L \
         -X POST \
         -H "Accept: application/vnd.github+json" \
-        -H "Authorization: Bearer ${PUBLIC_TOKEN}" \
+        -H "Authorization: Bearer ${PUBLIC_PUSH_TOKEN}" \
         -H "X-GitHub-Api-Version: 2022-11-28" \
         https://api.github.com/repos/${PUBLIC_REPO}/releases \
         -d "{\"tag_name\":\"${PUBLIC_TAG}\",\"target_commitish\":\"${PUBLIC_BRANCH}\",\"name\":\"${PUBLIC_RELEASE_NAME}\",\"body\":\"${PUBLIC_RELEASE_NOTES}\",\"draft\":false,\"prerelease\":false,\"generate_release_notes\":false}" | jq '.id')
@@ -286,7 +289,7 @@ release public:
       curl -L \
         -X POST \
         -H "Accept: application/vnd.github+json" \
-        -H "Authorization: Bearer ${PUBLIC_TOKEN}" \
+        -H "Authorization: Bearer ${PUBLIC_PUSH_TOKEN}" \
         -H "X-GitHub-Api-Version: 2022-11-28" \
         -H "Content-Type: application/octet-stream" \
         https://uploads.github.com/repos/${PUBLIC_REPO}/releases/${RELEASE_ID}/assets?name=${ARTIFACT} \