Update main

# Conflicts:
#	lib/hal/dpdk/bbdev/plugin_bbdev_acc_factory.cpp
#	lib/hal/phy/upper/channel_processors/plugin_bbdev_pdsch_enc_acc_factory.cpp
#	lib/hal/phy/upper/channel_processors/plugin_bbdev_pdsch_enc_acc_factory.h
#	lib/hal/phy/upper/channel_processors/pusch/plugin_bbdev_pusch_dec_acc_factory.cpp
#	lib/hal/phy/upper/channel_processors/pusch/plugin_bbdev_pusch_dec_acc_factory.h
#	tests/unittests/adt/circular_map_test_alt.cpp

.gitlab-ci.yml

@@ -82,6 +82,8 @@ pr reminder:
 trigger builder:
   stage: ci
   rules:
+    - if: $CI_MERGE_REQUEST_LABELS =~ /no-builder/
+      when: never  
     - if: $ON_MR
       changes:
         paths:
@@ -95,6 +97,8 @@ trigger builder:
 trigger docker:
   stage: ci
   rules:
+    - if: $CI_MERGE_REQUEST_LABELS =~ /no-docker/
+      when: never  
     - if: $ON_MR
       changes:
         paths:

.gitlab/ci-shared/build.yml

@@ -45,6 +45,22 @@ variables:
 .build_and_unit_template:
   image: ${CR_REGISTRY_URI}/srsgnb/builder-${OS}:${DOCKER_BUILDER_VERSION}
   variables:
+    CMAKE_BUILD_TYPE: "" # Empty for cmake default
+    ASSERT_LEVEL: "" # Empty for cmake default
+    ENABLE_EXPORT: "" # Empty for cmake default
+    ENABLE_FFTW: "" # Empty for cmake default
+    ENABLE_MKL: "False" # Empty for cmake default
+    ENABLE_ARMPL: "False" # Empty for cmake default
+    ENABLE_UHD: "" # Empty for cmake default
+    ENABLE_DPDK: "" # Empty for cmake default
+    ENABLE_ZEROMQ: "" # Empty for cmake default
+    ENABLE_ASAN: "" # Empty for cmake default
+    ENABLE_TSAN: "" # Empty for cmake default
+    ENABLE_GCOV: "" # Empty for cmake default
+    ENABLE_WERROR: "" # Empty for cmake default
+    FORCE_DEBUG_INFO: "" # Empty for cmake default
+    MARCH: "" # Empty for cmake default
+    MTUNE: "" # Empty for cmake default
     # TEST
     TEST_EXECUTION_TIMEOUT: 0
     # CI
@@ -56,6 +72,19 @@ variables:
     - ${INFRASTRUCTURE_TAG}
   before_script:
     - |
+      for var in \
+        CMAKE_BUILD_TYPE ASSERT_LEVEL ENABLE_EXPORT \
+        ENABLE_FFTW ENABLE_MKL ENABLE_ARMPL \
+        ENABLE_UHD ENABLE_DPDK ENABLE_ZEROMQ \
+        ENABLE_ASAN ENABLE_TSAN ENABLE_GCOV \
+        ENABLE_WERROR FORCE_DEBUG_INFO \
+        MARCH MTUNE \
+      ; do
+        if [ -n "${!var}" ]; then
+          BUILD_ARGS="-D${var}=${!var} ${BUILD_ARGS}"
+        fi
+      done
+
       BUILD_CMD="${BUILD_ARGS}"
       if [ -n "${DPDK_VERSION}" ]; then
         BUILD_CMD="-d ${DPDK_VERSION} ${BUILD_CMD}"
@@ -65,6 +94,11 @@ variables:
         BUILD_CMD="-u ${UHD_VERSION} ${BUILD_CMD}"
         export LD_LIBRARY_PATH=/opt/uhd/${UHD_VERSION}/lib:${LD_LIBRARY_PATH}
       fi
+      if [ -n "${ENABLE_ARMPL}" ]; then
+        if ARMPL_DIR=$(ls -d /opt/arm/armpl_* 2>/dev/null); then
+            export LD_LIBRARY_PATH=${ARMPL_DIR}/lib:${LD_LIBRARY_PATH}
+        fi
+      fi
       if [ -n "${COMPILER}" ]; then
         BUILD_CMD="-c ${COMPILER} ${BUILD_CMD}"
       fi

.gitlab/ci-shared/plugin.yml

@@ -18,45 +18,6 @@ variables:
   SRSRANDIR: &srsran_dir ${CI_PROJECT_DIR}/srsgnb
   SRSRAN_REPO_URL: https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/softwareradiosystems/srsgnb.git
 
-  INFRASTRUCTURE_TAG:
-    description: Computer architecture and supported instruction sets
-    options:
-      - amd64
-      - amd64-avx2
-      - amd64-avx2-avx512
-      - arm64
-    value: "amd64-avx2"
-  OS:
-    description: Operating system
-    options:
-      - "ubuntu-24.10"
-      - "ubuntu-24.04"
-      - "ubuntu-23.10"
-      - "ubuntu-22.04"
-      - "debian-12"
-      - "debian-11"
-      - "archlinux-latest"
-      - "rhel-8"
-    value: "ubuntu-24.04"
-  COMPILER:
-    description: Compiler to use
-    options:
-      - "gcc"
-      - "clang"
-    value: "gcc"
-  BUILD_ARGS:
-    description: It will be passed to cmake
-    value: ""
-  MAKE_ARGS:
-    description: It will be passed to make
-    value: ""
-  UHD_VERSION:
-    description: must be one version supported in the specified OS
-    value: ""
-  DPDK_VERSION:
-    description: must be one version supported in the specified OS
-    value: ""
-
 ######
 # CI #
 ######
@@ -111,6 +72,8 @@ builder version:
     - if: $ON_WEB
     - if: $ON_API
     - if: $ON_SCHEDULE
+    - if: $CI_DESCRIPTION =~ /Release/
+      when: never
     - if: $CI_DESCRIPTION
   variables:
     SRSRANDIR: *srsran_dir
@@ -135,15 +98,15 @@ load retina variables:
 ##################
 .cache_set:
   cache:
-    - key: ${OS}-${COMPILER}-${BUILD_ARGS}
+    - key: ${OS}-${COMPILER}-${CMAKE_BUILD_TYPE}-${MARCH}
       paths:
         - ${CI_PROJECT_DIR}/ccache
         - ${SRSRANDIR}/ccache
       policy: push
 
 .cache_get:
   cache:
-    - key: ${OS}-${COMPILER}-${BUILD_ARGS}
+    - key: ${OS}-${COMPILER}-${CMAKE_BUILD_TYPE}-${MARCH}
       paths:
         - ${CI_PROJECT_DIR}/ccache
         - ${SRSRANDIR}/ccache