Update main

# Conflicts:
#	CMakeLists.txt
#	README.md
#	include/srsran/radio/radio_notification_handler.h
#	lib/phy/upper/signal_processors/channel_estimator/port_channel_estimator_pool.h
#	lib/ru/generic/CMakeLists.txt
#	lib/ru/generic/lower_phy/lower_phy_factory.h
#	lib/ru/generic/ru_config_validator.h
#	lib/ru/generic/ru_downlink_handler_generic_impl.cpp
#	lib/ru/generic/ru_factory_generic_impl.cpp
#	lib/ru/generic/ru_generic_impl.cpp
#	lib/ru/generic/ru_metrics_collector_generic_impl.cpp
#	lib/ru/generic/ru_metrics_collector_generic_impl.h
#	lib/ru/generic/ru_radio_notifier_handler.h
#	lib/ru/generic/ru_uplink_request_handler_generic_impl.cpp
#	lib/scheduler/ue_context/dl_logical_channel_manager.cpp
#	lib/scheduler/ue_context/dl_logical_channel_manager.h
#	lib/scheduler/ue_context/ul_logical_channel_manager.cpp
#	lib/scheduler/ue_context/ul_logical_channel_manager.h
#	tests/unittests/phy/upper/channel_processors/prach_detector_test_data.tar.gz
#	tests/unittests/scheduler/ue_scheduling/dl_logical_channel_test.cpp
#	tests/unittests/scheduler/ue_scheduling/ul_logical_channel_test.cpp

Author: codebot

.gitlab-ci.yml

@@ -36,7 +36,6 @@ include:
   - project: softwareradiosystems/ci/tools
     ref: "23"
     file: .gitlab/ci-shared/tools/tagger.yml
-  - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/build.yml
   - local: .gitlab/ci/trx.yml
   - local: .gitlab/ci/e2e.yml
@@ -374,9 +373,6 @@ full-code-format:
   tags:
     - amd64
   needs:
-    - job: builder version
-      optional: false
-      artifacts: true
     - job: trigger builder
       optional: true
       artifacts: false

.gitlab/ci-shared/build.yml

@@ -1,49 +1,13 @@
-variables:
-  INFRASTRUCTURE_TAG:
-    description: Computer architecture and supported instruction sets
-    options:
-      - amd64
-      - amd64-avx2
-      - amd64-avx2-avx512
-      - arm64
-      - on-prem-amd64
-      - on-prem-arm64
-      - aws-spot-amd64
-      - aws-spot-arm64
-    value: "amd64-avx2"
-  OS:
-    description: Operating system
-    options:
-      - "ubuntu-24.10"
-      - "ubuntu-24.04"
-      - "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: ""
-  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: ""
-  TEST_MODE:
-    description: Run tests with labels matching regular expression. "none" won't run any test at all.
-    value: "default"
+include:
+  - local: .gitlab/ci/builders/version.yml
 
 .build_and_unit_template:
   image: ${CR_REGISTRY_URI}/srsgnb/builder-${OS}:${DOCKER_BUILDER_VERSION}
   variables:
+    OS: "ubuntu-24.04"
+    COMPILER: "gcc"
+    UHD_VERSION: ""
+    DPDK_VERSION: ""
     CMAKE_BUILD_TYPE: "" # Empty for cmake default
     ASSERT_LEVEL: "" # Empty for cmake default
     ENABLE_EXPORT: "" # Empty for cmake default
@@ -70,8 +34,10 @@ variables:
     # CACHE
     CCACHE_MAXSIZE: 3G
     # TEST
+    TEST_MODE: "default"
     TEST_EXECUTION_TIMEOUT: 0
     # CI
+    INFRASTRUCTURE_TAG: amd64-avx2
     TRANSFER_METER_FREQUENCY: 5s
     ARTIFACT_COMPRESSION_LEVEL: slowest
     CACHE_COMPRESSION_LEVEL: slowest

.gitlab/ci-shared/plugin.yml

@@ -38,4 +38,3 @@ include-guards:
     - launch_tests_srsran
   needs:
     - job: download srsran
-    - job: builder version

.gitlab/ci-shared/template.yml

@@ -7,7 +7,6 @@ include:
     file: .gitlab/ci-shared/features/all.yml
   - local: .gitlab/ci-shared/e2e.yml
   - local: .gitlab/ci-shared/build.yml
-  - local: .gitlab/ci/builders/version.yml
 
 variables:
   # CI
@@ -87,21 +86,6 @@ download srsran:
       - $SRSRANDIR
   needs: []
 
-builder version:
-  extends: .builder version
-  rules:
-    - if: $ON_MR
-    - if: $ON_WEB
-    - if: $ON_API
-    - if: $ON_SCHEDULE
-    - if: $CI_DESCRIPTION =~ /Release/
-      when: never
-    - if: $CI_DESCRIPTION
-  variables:
-    SRSRANDIR: *srsran_dir
-  needs:
-    - job: download srsran
-
 #########
 # Build #
 #########
@@ -146,4 +130,3 @@ builder version:
   timeout: 1h
   needs:
     - job: download srsran
-    - job: builder version

.gitlab/ci/build.yml

@@ -13,6 +13,47 @@ include:
   - local: .gitlab/ci-shared/build.yml
 
 variables:
+  INFRASTRUCTURE_TAG:
+    description: Computer architecture and supported instruction sets
+    options:
+      - amd64
+      - amd64-avx2
+      - amd64-avx2-avx512
+      - arm64
+      - on-prem-amd64
+      - on-prem-arm64
+      - aws-spot-amd64
+      - aws-spot-arm64
+    value: "amd64-avx2"
+  OS:
+    description: Operating system
+    options:
+      - "ubuntu-24.10"
+      - "ubuntu-24.04"
+      - "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: ""
+  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: ""
+  TEST_MODE:
+    description: Run tests with labels matching regular expression. "none" won't run any test at all.
+    value: "default"
   SRSRANDIR: ${CI_PROJECT_DIR}
 
 ################
@@ -39,9 +80,6 @@ variables:
   extends: .build_and_unit_template
   stage: build and unit tests
   needs:
-    - job: builder version
-      optional: false
-      artifacts: true
     - job: trigger builder
       optional: true
       artifacts: false
@@ -307,6 +345,11 @@ variables:
     MARCH: x86-64-v3
     LINKER: lld
     INFRASTRUCTURE_TAG: amd64-avx2
+  artifacts: &valgrind_artifacts
+    when: on_failure
+    paths:
+      - build/Testing/Temporary
+    expire_in: 5 days
 
 .smoke avx512:
   extends: .build_and_unit
@@ -680,19 +723,8 @@ valgrind changed tests:
       build_srsgnb
     - echo "This test execution has a timeout of ${TEST_EXECUTION_TIMEOUT}. If the execution excess that timer, the job will be marked as allowed_to_fail. This will avoid the job to have a huge duration in a MR pipeline."
     - launch_tests
-  after_script:
-    - mv ${CI_PROJECT_DIR}/build/Testing/Temporary /tmp/Testing_Temporary
-    - cd build
-    - make clean
-    - mkdir -p ${CI_PROJECT_DIR}/build/Testing
-    - mv /tmp/Testing_Temporary ${CI_PROJECT_DIR}/build/Testing/Temporary
   cache:
     - *cache_build_get
-  artifacts: &valgrind_artifacts
-    when: on_failure
-    paths:
-      - build/Testing/Temporary
-    expire_in: 1 day
 
 intermediate commits clean:
   extends: intermediate commits cached
@@ -726,8 +758,6 @@ build on release branch:
     PLUGIN_INDEX_ARRAY: ""
   tags: ["amd64-avx2"]
   needs:
-    - job: builder version
-      artifacts: true
     - job: load build env for release branch
       artifacts: true
 
@@ -817,12 +847,6 @@ smoke valgrind update cache:
       start_in: 45 minutes
   interruptible: false
   retry: 2
-  after_script:
-    - *build_after_script
-  artifacts:
-    <<: *build_artifacts
-    when: on_failure
-    expire_in: 1 day
   cache:
     - *cache_build_set