Update main

# Conflicts:
#	README.md
#	include/srsran/phy/upper/tx_buffer.h
#	include/srsran/phy/upper/tx_buffer_pool.h
#	include/srsran/phy/upper/unique_tx_buffer.h
#	lib/phy/upper/tx_buffer_codeblock_pool.h
#	lib/phy/upper/tx_buffer_impl.h
#	lib/phy/upper/tx_buffer_pool_impl.cpp
#	lib/phy/upper/tx_buffer_pool_impl.h
#	tests/unittests/phy/upper/tx_buffer_pool_test.cpp
#	tests/unittests/phy/upper/tx_buffer_pool_test_doubles.h
#	tests/unittests/phy/upper/tx_buffer_test_doubles.h

Author: codebot

.gitlab-ci.yml

@@ -25,16 +25,16 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/features/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/python.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/build.yml
@@ -46,7 +46,8 @@ stages:
   - ci
   - static
   - build and unit tests
-  - e2e
+  - zmq
+  - rf
   - manual
   - documentation
   - private
@@ -155,10 +156,10 @@ full-code-format:
     ANALYZER: ""
     ANALYZER_ARGS: ""
     ARTIFACT_EXTRA_PATH: ""
-    KUBERNETES_CPU_REQUEST: "3.5"
-    KUBERNETES_CPU_LIMIT: "3.5"
-    KUBERNETES_MEMORY_REQUEST: 6Gi
-    KUBERNETES_MEMORY_LIMIT: 6Gi
+    KUBERNETES_CPU_REQUEST: 6
+    KUBERNETES_CPU_LIMIT: 6
+    KUBERNETES_MEMORY_REQUEST: 12Gi
+    KUBERNETES_MEMORY_LIMIT: 12Gi
   before_script:
     - |
       echo "
@@ -180,7 +181,7 @@ full-code-format:
       cmake -DASSERT_LEVEL=PARANOID -DAUTO_DETECT_ISA=False -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
       make srsran_build_info # needed to generate hashes.h
   script:
-    - static-analyzer.sh -i /tmp/codechecker_skip --analyzers ${ANALYZER} ${ANALYZER_ARGS} $CI_PROJECT_DIR
+    - static-analyzer.sh -i /tmp/codechecker_skip --jobs ${KUBERNETES_CPU_REQUEST} --analyzers ${ANALYZER} ${ANALYZER_ARGS} $CI_PROJECT_DIR
   after_script:
     - mv codechecker_html codechecker-${ANALYZER}-html
   artifacts: &codechecker_artifacts
@@ -212,7 +213,7 @@ cppcheck:
   interruptible: false
   variables:
     ANALYZER: cppcheck
-    ANALYZER_ARGS: --cppcheck-max-template-recursion 10
+    ANALYZER_ARGS: --cppcheck-max-template-recursion 5
   artifacts:
     <<: *codechecker_artifacts
     expire_in: 1 day
@@ -444,8 +445,14 @@ disable current schedule:
   stage: .post
   extends: .enable-schedule-by-description
   rules:
-    - if: $GRADUATION_BRANCH
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      when: always
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
       when: always
+    - if: $CI_DESCRIPTION =~ /Alternative OSs/
+      when: always
+    - if: $CI_DESCRIPTION =~ /Weekly/
+      when: always                  
   interruptible: false
   variables:
     ENABLE: "false"

.gitlab/ci/build.yml

@@ -1743,7 +1743,7 @@ basic asan:
     <<: *build_artifacts
     expire_in: 1 day
 
-basic valgrind:
+basic memcheck:
   extends: .smoke valgrind
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
@@ -1760,8 +1760,8 @@ basic avx512 dpdk:
   extends: .build_and_unit
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
-      when: delayed
-      start_in: 60 minutes
+      when: manual
+      allow_failure: true
   retry: 2
   interruptible: false
   variables:
@@ -1775,6 +1775,7 @@ basic avx512 dpdk:
     DPDK_VERSION: "23.11"
     AUTO_DETECT_ISA: "True"
     ENABLE_AVX512: "True"
+    ASSERT_LEVEL: MINIMAL
     SAVE_ARTIFACTS: "True"
     KUBERNETES_CPU_REQUEST: 14
     KUBERNETES_CPU_LIMIT: 14
@@ -1788,7 +1789,7 @@ basic avx512 dpdk:
 #######
 # Web #
 #######
-custom-build:
+custom build:
   extends: .build_and_unit
   rules:
     - if: $ON_WEB

.gitlab/ci/builders.yml

@@ -8,13 +8,13 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/docker.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/python.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/src_cache.yml
@@ -263,17 +263,14 @@ ubuntu-dpdk-builder:
     - !reference [.fetch_src_cache, cache]
 
 .alternative-tag:
-  extends: .docker manifest
+  extends: .docker copy
   stage: alt registries
   variables:
     OS_NAME: none
     OS_VERSION: none
     VERSION: $DOCKER_BUILDER_VERSION
     ALT_REGISTRY: ${GITLAB_REGISTRY_URI}
   script:
-    - |
-      DEBIAN_FRONTEND=noninteractive apt-get update && \
-        apt-get install -y --no-install-recommends skopeo
     - |
       skopeo copy \
         docker://${CR_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-$OS_NAME-$OS_VERSION:${VERSION} \
@@ -286,14 +283,9 @@ ubuntu-dpdk-builder:
     OS_NAME: none
     OS_VERSION: none
     VERSION: $DOCKER_BUILDER_VERSION
-    REGISTRY: ${CR_REGISTRY_URI}
-  script:
+  before_script:
     - |
-      docker manifest create \
-        ${REGISTRY}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-${OS_NAME}-${OS_VERSION}:${VERSION} \
-        --amend ${REGISTRY}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-${OS_NAME}-${OS_VERSION}:${VERSION}-amd64 \
-        --amend ${REGISTRY}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-${OS_NAME}-${OS_VERSION}:${VERSION}-arm64
-      docker manifest push ${REGISTRY}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-${OS_NAME}-${OS_VERSION}:${VERSION}
+      export NAME=builder-${OS_NAME}-${OS_VERSION}
 
 ################################################################################
 # Codechecker
@@ -324,6 +316,15 @@ image-build-publish [codechecker]:
   cache:
     - !reference [.fetch_src_cache, cache]
 
+alternative-tag [codechecker]:
+  extends: .docker copy
+  stage: alt registries
+  script:
+    - |
+      skopeo copy \
+        docker://${CR_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION} \
+        docker://${GITLAB_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION}
+
 ################################################################################
 # Ubuntu 20.04
 ################################################################################
@@ -865,15 +866,12 @@ alternative-tag [archlinux, latest, amd64]:
     - image-build-publish [archlinux, latest, amd64]
 
 manifest [archlinux, latest]:
-  extends: .docker manifest
+  extends: .docker copy
   stage: manifest
   variables:
     OS_NAME: archlinux
     OS_VERSION: latest
   script:
-    - |
-      DEBIAN_FRONTEND=noninteractive apt-get update && \
-        apt-get install -y --no-install-recommends skopeo
     - |
       skopeo copy \
         docker://${REGISTRY}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/builder-$OS_NAME-$OS_VERSION:${DOCKER_BUILDER_VERSION}-amd64 \

.gitlab/ci/builders/codechecker/Dockerfile

@@ -8,7 +8,7 @@
 
 ARG CR_REGISTRY_URI
 ARG CI_TOOLS_REPO
-ARG CODECHECKER_VERSION=1.0.0
+ARG CODECHECKER_VERSION=1.0.1
 
 FROM ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/codechecker:${CODECHECKER_VERSION}
 

.gitlab/ci/builders/debian/Dockerfile

@@ -10,29 +10,25 @@ ARG VERSION=22.04
 ARG OS_NAME=ubuntu
 FROM $OS_NAME:$VERSION
 
-ADD install_dependencies.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/install_dependencies.sh
-
-RUN TZ=Europe/Madrid && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN install_dependencies.sh && apt-get install -y --no-install-recommends \
-  git git-lfs \
-  clang llvm \
-  ccache gcovr valgrind \
-  python3-dev python3-venv \
-  && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && git lfs install
-
-RUN (DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends libclang-rt-dev || true) \
-  && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD builder.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/builder.sh
-
-RUN python3 -m venv /usr/local/builder_tools
-RUN /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
-ADD changed_tests.py /usr/local/bin
-RUN chmod +x /usr/local/bin/changed_tests.py
-ADD ram_reporter.py /usr/local/bin
-RUN chmod +x /usr/local/bin/ram_reporter.py
+RUN TZ=Europe/Madrid && \
+    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    git git-lfs \
+    clang llvm \
+    ccache gcovr valgrind \
+    python3-dev python3-venv && \
+    (apt-get install -y --no-install-recommends libclang-rt-dev || true) && \
+    apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    git lfs install
+
+ADD install_dependencies.sh builder.sh changed_tests.py ram_reporter.py /usr/local/bin/
+RUN chmod +x /usr/local/bin/install_dependencies.sh /usr/local/bin/builder.sh /usr/local/bin/changed_tests.py /usr/local/bin/ram_reporter.py && \
+    /usr/local/bin/install_dependencies.sh && \
+    apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    python3 -m venv /usr/local/builder_tools && \
+    /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
 
 ADD uhd /opt/uhd
 ADD dpdk /opt/dpdk

.gitlab/ci/docker.yml

@@ -8,13 +8,13 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/python.yml
   - project: softwareradiosystems/ci/tools
-    ref: "16"
+    ref: "17"
     file: .gitlab/ci-shared/tools/docker.yml
 
 ################################################################################