Update main

Author: codebot

.gitlab-ci.yml

@@ -396,6 +396,8 @@ full-code-format:
     - |
       echo "
       -/usr/lib
+      -*CMakeTmp
+      -*CompilerIdCXX
       -*tests/unittests
       -*tests/integrationtests
       -*tests/benchmarks
@@ -425,7 +427,7 @@ full-code-format:
           done
       }
       export -f monitor_child_process
-  script:
+  script: &codechecker_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:
@@ -440,6 +442,17 @@ full-code-format:
 
 clang-tidy:
   extends: .codechecker
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+  interruptible: false
+  retry: 2
+  variables:
+    ANALYZER: clang-tidy
+    ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
+    ARTIFACT_EXTRA_PATH: "/index.html"
+
+clang-tidy incremental:
+  extends: clang-tidy
   stage: manual
   rules:
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
@@ -449,9 +462,26 @@ clang-tidy:
       when: manual
       allow_failure: false
   variables:
-    ANALYZER: clang-tidy
-    ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
-    ARTIFACT_EXTRA_PATH: "/index.html"
+    CCACHE_MAXSIZE: 3G
+    CACHE_COMPRESSION_LEVEL: slowest
+    CACHE_REQUEST_TIMEOUT: 5 # minutes - 10 by default
+  script:
+    - |
+      cd $CI_PROJECT_DIR
+      git config advice.detachedHead false
+      git config --local core.hooksPath /dev/null
+      git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    - |
+      for rev in $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME; do
+        git checkout $rev
+        CodeChecker log -o ${CI_PROJECT_DIR}/build/compile_commands.json --build "builder.sh -m -j${KUBERNETES_CPU_REQUEST} -c clang -DMARCH=x86-64-v3 -DENABLE_ARMPL=False -DENABLE_MKL=False -DENABLE_FFTW=True -DASSERT_LEVEL=PARANOID -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=False $CI_PROJECT_DIR"
+      done
+    - *codechecker_script
+  cache:
+    - key: codechecker-clang-tidy
+      paths: [ccache]
+      policy: pull-push
+      when: always
 
 cppcheck:
   extends: .codechecker
@@ -465,7 +495,7 @@ cppcheck:
     ANALYZER_ARGS: --cppcheck-max-template-recursion 5
   artifacts:
     <<: *codechecker_artifacts
-    expire_in: 1 day
+    expire_in: 7 days
 
 clangsa:
   extends: .codechecker

.gitlab/ci-shared/e2e.yml

@@ -38,6 +38,12 @@ variables:
       - warning
       - error
     value: "info"
+  CLUSTER:
+    description: Kubernetes cluster to use
+    options:
+      - "retina-e2e-amd64"
+      - "new-retina-e2e-amd64"
+    value: "retina-e2e-amd64"
 
 .load retina variables:
   stage: ci
@@ -52,10 +58,16 @@ variables:
 
 .prepare_test:
   variables: &setup_kube_variables
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
-    KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
     GIT_LFS_SKIP_SMUDGE: 1
   before_script: &setup_kube_config
+    - |
+      if [ "$CLUSTER" = "new-retina-e2e-amd64" ]; then
+        export KUBECONFIG_VAR_NAME="RETINA_NAMESPACE_KUBECONFIG_LAB_BCN"
+        export KUBECONFIG_VAR_NAME_EXTRA=""
+      else
+        export KUBECONFIG_VAR_NAME="RETINA_NAMESPACE_KUBECONFIG"
+        export KUBECONFIG_VAR_NAME_EXTRA="RETINA_NAMESPACE_KUBECONFIG_EXTRA"
+      fi
     - |
       export FORCE_COLOR=1
       eval K_PATH="\$$KUBECONFIG_VAR_NAME"
@@ -83,7 +95,7 @@ variables:
     <<: *setup_kube_variables
     GROUP: zmq
   tags:
-    - retina-e2e-amd64
+    - ${CLUSTER}
   artifacts:
     paths:
       - ${SRSRANDIR}/tests/e2e/log
@@ -95,6 +107,7 @@ variables:
     - *setup_kube_config
     - |
       # Print E2E parameters
+      echo "CLUSTER=${CLUSTER}"
       echo "GROUP=${GROUP}"
       echo "TESTBED=${TESTBED}"
       echo "E2E_FILE_OR_DIR=${E2E_FILE_OR_DIR}"

.gitlab/ci/build.yml

@@ -263,7 +263,6 @@ variables:
     ENABLE_TSAN: "True"
     TEST_MODE: tsan
     MARCH: x86-64-v3
-    LINKER: lld
     INFRASTRUCTURE_TAG: amd64-avx2
 
 .smoke archlinux:

.gitlab/ci/builders/archlinux/Dockerfile

@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-ARG VERSION=base-20250810.0.398652
+ARG VERSION=base-20250824.0.410029
 FROM archlinux:$VERSION
 
 ADD install_dependencies.sh /usr/local/bin

.gitlab/ci/builders/codechecker/Dockerfile

@@ -8,12 +8,12 @@
 
 ARG CR_REGISTRY_URI
 ARG CI_TOOLS_REPO
-ARG CODECHECKER_VERSION=1.0.1
+ARG CODECHECKER_VERSION=6.26.1
 
 FROM ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/codechecker:${CODECHECKER_VERSION}
 
-ADD install_dependencies.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/install_dependencies.sh
+ADD install_dependencies.sh builder.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/install_dependencies.sh /usr/local/bin/builder.sh
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && install_dependencies.sh \
   && apt-get install -y --no-install-recommends git \

.gitlab/ci/e2e.yml

@@ -102,10 +102,7 @@ smoke zmq:
     RETINA_LAUNCHER_ARGS: -x ${EXTRA_SMOKE_ZMQ}
     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
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG_LAB_BCN"
-    KUBECONFIG_VAR_NAME_EXTRA: ""
-  tags:
-    - new-retina-e2e-amd64
+    CLUSTER: new-retina-e2e-amd64
   before_script:
     - |
       export TESTBED=zmq
@@ -129,10 +126,7 @@ smoke zmq:
   variables:
     TESTBED: zmq
     E2E_LOG_LEVEL: info
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG_LAB_BCN"
-    KUBECONFIG_VAR_NAME_EXTRA: ""
-  tags:
-    - new-retina-e2e-amd64
+    CLUSTER: new-retina-e2e-amd64
   needs:
     - job: basic relwithdeb
       artifacts: true
@@ -363,10 +357,7 @@ test mode ue:
     MARKERS: test_mode
     KEYWORDS: test_ue
     E2E_LOG_LEVEL: warning
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG_LAB_BCN"
-    KUBECONFIG_VAR_NAME_EXTRA: ""
-  tags:
-    - new-retina-e2e-amd64
+    CLUSTER: new-retina-e2e-amd64
   needs:
     - job: basic relwithdeb
       artifacts: true
@@ -728,12 +719,16 @@ retina setup:
     name: ${RETINA_REGISTRY_PREFIX}/launcher:${RETINA_VERSION}
     entrypoint: ["/bin/sh", "-c"]
   tags:
-    - retina-e2e-amd64
+    - ${CLUSTER}
   script:
     - |
       retina-garbage-collector --mode demolition
   needs:
     - *retina-needs
+  parallel:
+    matrix:
+      - CLUSTER: retina-e2e-amd64
+      - CLUSTER: new-retina-e2e-amd64
 
 retina runners:
   stage: ci

.gitlab/ci/e2e/.env

@@ -9,7 +9,7 @@ OPEN5GS_VERSION=2.7.0
 FLEXRIC_VERSION=br-flexric
 NTN_CHANNEL_EMULATOR_VERSION=0.1
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-SRS_TELEGRAF_VERSION=0.14.0
+SRS_TELEGRAF_VERSION=0.16.0
 DPDK_VERSION=24.11.2
 ZMQ_HOSTLABEL_0=kubernetes.io/hostname=hp-generic-2
 ZMQ_HOSTLABEL_1=kubernetes.io/hostname=ci-buildmaster

.gitlab/ci/release.yml

@@ -119,7 +119,7 @@ generate plugin pipeline:
     - cat update_plugin.yml
   needs:
     - job: load release variables
-      artifacts: true    
+      artifacts: true
   artifacts:
     paths:
       - update_plugin.yml
@@ -333,8 +333,10 @@ basic build final branch:
       if [[ $CI_COMMIT_TAG =~ ^([a-zA-Z0-9_]+)_([0-9]{4})\.([0-9]{2})\.([0-9]{2})$ ]]; then
         KEY="${BASH_REMATCH[1]}"
         if ! echo "$TAG_NAME_ARRAY" | grep -qw "$KEY"; then
-          git tag $(date -u +"%Y.%m.%d")
-          git push github_public tag $(date -u +"%Y.%m.%d")
+          TAG_DATE="$(date -u +'%Y.%m.%d')"
+          git tag -d "$TAG_DATE" 2>/dev/null || true
+          git tag "custom/$TAG_DATE" HEAD
+          git push github_public "refs/tags/custom/$TAG_DATE:refs/tags/$TAG_DATE"
         fi
       fi
 
@@ -415,16 +417,12 @@ notify branch published:
   rules:
     - if: *on_public_push
     - if: *on_public_release
-    - if: *on_custom_push
   needs:
     - job: load release variables
       artifacts: true
     - job: publish main
       optional: true
       artifacts: true
-    - job: publish custom
-      optional: true
-      artifacts: true
   variables:
     CI_DESCRIPTION: "$PUBLIC_REPO GitHub Updated"
     SLACK_CHANNEL: $SLACK_CHANNEL_OK
@@ -441,6 +439,7 @@ create tags after published:
     - |
       for name in $TAG_GH_PUSH_NAME_ARRAY; do
         create_tag "${name}_$(date -u +"%Y.%m.%d")"
+        sleep 3  # To avoid saturating gitlab CI
       done
   needs:
     - job: publish main
@@ -658,8 +657,6 @@ notify release failed:
       when: on_failure
     - if: *on_public_release
       when: on_failure
-    - if: *on_custom_push
-      when: on_failure
   variables:
     CI_DESCRIPTION: "GitHub Update Process Failed"
     SLACK_CHANNEL: $SLACK_CHANNEL_FAIL

.gitlab/ci/trx.yml

@@ -88,15 +88,12 @@ build trx driver:
   artifacts: &trx_artifacts
     paths:
       - build_trx_srsran/libtrx_srsran.so
-    expire_in: 4 hours
+    expire_in: 3 days
 
 build amariue zmq driver:
   extends: build trx driver
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
-  artifacts:
-    <<: *trx_artifacts
-    expire_in: 3 days
 
 build uesim zmq driver:
   extends: build trx driver
@@ -105,16 +102,10 @@ build uesim zmq driver:
   variables:
     OS: fedora-39
     AMARISOFT_VERSION: "2024-03-15"
-  artifacts:
-    <<: *trx_artifacts
-    expire_in: 3 days
 
 build amariue ntn zmq driver:
   extends: build trx driver
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
   variables:
     AMARISOFT_VERSION: "2024-12-13"
-  artifacts:
-    <<: *trx_artifacts
-    expire_in: 3 days

CMakeLists.txt

@@ -286,6 +286,7 @@ endif()
 ########################################################################
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/cmake-sbom")
 include(sbom)
+include(copyright)
 include(GNUInstallDirs)
 
 sbom_generate(
@@ -655,6 +656,7 @@ message(STATUS "Building srsRAN version ${SRSRAN_VERSION_STRING}")
 ########################################################################
 # Generate SBOM
 ########################################################################
+parse_copyright_file("${CMAKE_SOURCE_DIR}/COPYRIGHT")
 sbom_add(
     LICENSE "LicenseRef-srsRAN"
     NAME    "AGPL-3.0-only"