Merge commit '6283228f474c1e85f126000ba07a4b6c3b2cd01e' into agpl_main

# Conflicts:
#	CMakeLists.txt
#	apps/examples/du/radio_factory.cpp
#	apps/examples/du/radio_factory.h
#	docs/srsRan_logo.png
#	include/srsran/gateways/baseband/baseband_gateway_buffer.h
#	include/srsran/rrc/drb_manager.h
#	lib/asn1/rrc_nr/tdd_cfg_helper.cpp
#	lib/cu_cp/helpers/f1ap_asn1_helpers.h
#	lib/f1ap/common/f1ap_packet_procedures_impl.h
#	lib/rrc/ue/drb_manager_impl.cpp
#	lib/rrc/ue/drb_manager_impl.h
#	lib/scheduler/support/rb_find_algorithm.h
#	lib/scheduler/ue_scheduling/ue_dci_builder.cpp
#	lib/scheduler/ue_scheduling/ue_dci_builder.h
#	lib/scheduler/ue_scheduling/ue_sch_pdu_builder.cpp
#	lib/scheduler/ue_scheduling/ue_sch_pdu_builder.h
#	tests/benchmarks/phy/upper/downlink_processor_benchmark.cpp
#	tests/unittests/e2/CMakeLists.txt
#	tests/unittests/phy/upper/channel_coding/ldpc/ldpc_rate_matcher_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pdcch_modulator_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pdcch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pusch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/dmrs_pdcch_processor_test_data.tar.gz
#	tests/unittests/rrc/drb_manager_test.cpp

Author: codebot

.gitlab-ci.yml

@@ -25,27 +25,30 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "5"
+    ref: "6"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "5"
+    ref: "6"
     file: .gitlab/ci-shared/features/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "5"
+    ref: "6"
     file: .gitlab/ci-shared/tools/python.yml
   - project: softwareradiosystems/ci/tools
-    ref: "5"
+    ref: "6"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/build.yml
   - local: .gitlab/ci/trx.yml
   - local: .gitlab/ci/e2e.yml
+  - local: .gitlab/ci/release.yml
 
 stages:
   - ci
   - static
   - build and unit tests
   - e2e
   - documentation
+  - private
+  - public
 
 variables:
   SLACK_CHANNEL_OK: "#ci_gnb"
@@ -122,39 +125,32 @@ full-code-format:
 
 clang-tidy:
   extends: .codechecker
+  resource_group: ${CI_JOB_NAME_SLUG}_${GITLAB_USER_LOGIN}
   variables:
     ANALYZER: clang-tidy
     ANALYZER_ARGS: --tidy-config .clang-tidy
 
 cppcheck:
   extends: .codechecker
   rules:
-    - if: $ON_MR
-      when: manual
-      allow_failure: true
-      variables:
-        ARTIFACT_EXTRA_PATH: "/index.html"
     - if: $CI_DESCRIPTION =~ /Nightly/
+  interruptible: false
   variables:
     ANALYZER: cppcheck
     ANALYZER_ARGS: --cppcheck-max-template-recursion 10
 
 clangsa:
   extends: .codechecker
   rules:
-    - if: $ON_MR
-      when: manual
-      allow_failure: true
-      variables:
-        ARTIFACT_EXTRA_PATH: "/index.html"
     - if: $CI_DESCRIPTION =~ /Nightly/
       when: manual
       allow_failure: true
+  interruptible: false      
   variables:
     ANALYZER: clangsa
     ANALYZER_ARGS: --ctu
 
-coverity:
+.coverity_base:
   image: $CR_REGISTRY_URI/coverity_image/2022.6.0:1.0.0
   stage: static
   needs: []
@@ -163,8 +159,7 @@ coverity:
     KUBERNETES_MEMORY_REQUEST: 13Gi
   tags:
     - ${INFRASTRUCTURE_TAG}
-  rules:
-    - if: $CI_DESCRIPTION =~ /Weekly/
+  interruptible: false
   script:
     - |
       mkdir -p build
@@ -174,12 +169,30 @@ coverity:
       tar czvf srsgnb.tgz cov-int
       ver=$(git rev-parse HEAD)
 
-      curl --form token=$COVERITY_TOKEN \
+      curl --form token=$COV_TOKEN \
         --form [email protected] \
         --form [email protected] \
         --form version=$ver \
-        --form description="srsGNB dev build" \
-        https://scan.coverity.com/builds?project=srsRAN_5G
+        --form description="srsRAN Project dev build" \
+        https://scan.coverity.com/builds?project=${PROJECT_NAME}
+
+coverity-dev:
+  extends: .coverity_base
+  rules:
+    - if: $CI_DESCRIPTION =~ /Weekly/
+  before_script:
+    - export PROJECT_NAME="srsRAN_5G"
+    - export DESCRIPTION="srsRAN Project dev build"
+    - export COV_TOKEN="${COVERITY_TOKEN_DEV}"
+
+coverity-agpl:
+  extends: .coverity_base
+  rules:
+    - if: $CI_DESCRIPTION =~ /AGPL-COVERITY/
+  before_script:
+    - export PROJECT_NAME="srsRAN_5G_agpl"
+    - export DESCRIPTION="srsRAN Project AGPL build"
+    - export COV_TOKEN="${COVERITY_TOKEN_AGPL}"
 
 e2e tests tox:
   stage: static
@@ -340,6 +353,7 @@ promote code:
   stage: .post
   rules:
     - if: $GRADUATION_BRANCH
+  interruptible: false
   variables:
     GIT_STRATEGY: none
   image: alpine:3.16.0 # sh entrypoint
@@ -375,6 +389,7 @@ disable current schedule:
   rules:
     - if: $GRADUATION_BRANCH
       when: always
+  interruptible: false
   variables:
     ENABLE: "false"
     BRANCH: $CI_COMMIT_REF_NAME
@@ -386,6 +401,7 @@ enable schedule on graduation branch:
   extends: .enable-schedule-by-branch
   rules:
     - if: $GRADUATION_BRANCH
+  interruptible: false
   variables:
     ENABLE: "true"
     BRANCH: $GRADUATION_BRANCH

.gitlab/ci/auto_merge.sh

@@ -0,0 +1,157 @@
+#!/bin/bash
+#
+# Copyright 2021-2023 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set -e
+
+# Checks the git status and tries to `git rm` the files removed from
+# the source branch to the commit.
+rm_deleted_by_them() {
+    delete_name="deleted by them:"
+    delete_size_next=${#delete_name}+1
+    lines=$(git status)
+    while read -r line; do
+        status=${line:0:${#delete_name}}
+
+        if [[ "$status" == "$delete_name" ]]; then
+            path_name=${line:$delete_size_next:${#line}}
+            git rm "$path_name"
+        fi
+
+    done <<<"$lines"
+}
+
+# Checks the git status and tries to `git rm` the files removed from
+# the target branch to the commit.
+rm_deleted_by_us() {
+    delete_name="deleted by us:"
+    delete_size_next=${#delete_name}+3
+    lines=$(git status)
+    while read -r line; do
+        status=${line:0:${#delete_name}}
+
+        if [[ "$status" == "$delete_name" ]]; then
+            path_name=${line:$delete_size_next:${#line}}
+            git rm "$path_name"
+        fi
+
+    done <<<"$lines"
+}
+
+# Fixes the conflicts using theirs and adds them to the commit.
+fix_conflicts_using_theirs() {
+    conflict_name="both modified:"
+    conflict_size_next=${#conflict_name}+3
+    lines=$(git status)
+    while read -r line; do
+        status=${line:0:${#conflict_name}}
+
+        if [[ "$status" == "$conflict_name" ]]; then
+            path_name=${line:$conflict_size_next:${#line}}
+            echo "Resolving using theirs $path_name"
+            git checkout --theirs "$path_name"
+            git add "$path_name"
+        fi
+
+    done <<<"$lines"
+}
+
+remove_lfs_files() {
+    while read -r line; do
+        git rm --cached "$line"
+    done < <(git lfs ls-files | sed -r 's/^.{13}//')
+}
+
+update_headers() {
+    # for actual source and header files
+    find . -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.h.in" \) ! -path "*/external/*" ! -name "rfnoc_test.cc" -exec perl -0777 -pi -e "s{/\*.*?\*/}{/*
+ *
+ * Copyright 2021-$(date +%Y) Software Radio Systems Limited
+ *
+ * This file is part of srsRAN.
+ *
+ * srsRAN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsRAN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */}s" {} \;
+
+    # for CMake/YML files
+    find . -type f -\( -name "CMakeLists.txt" -o -name "*.cmake" -o -name "*.yml" -o -name "*.sh" \) ! -path "*/configs/*" ! -path "*/.gitlab/*" ! -name "FindBackward.cmake" ! -name "FindRapidJSON.cmake" ! -name "CheckCSourceRuns.cmake" ! -name "CheckFunctionExistsMath.cmake" -exec perl -0777 -pi -e "s/#[^!][\s\S]*?(?=\n.*?=|\n\n)/#
+# Copyright 2021-$(date +%Y) Software Radio Systems Limited
+#
+# This file is part of srsRAN
+#
+# srsRAN is free software: you can redistribute it and\/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# srsRAN is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# A copy of the GNU Affero General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http:\/\/www.gnu.org\/licenses\/.
+#/" {} \;
+}
+
+main() {
+    # Check number of args
+    if (($# != 2)); then
+        echo >&2 "Please call script with source branch and target branch as argument"
+        echo >&2 "E.g. ./auto_merge.sh <source_branch> <target_branch>"
+        exit 1
+    fi
+
+    local source_branch=$1
+    local target_branch=$2
+
+    # Checkout target branch
+    git fetch -q origin "$target_branch"
+    if ! git checkout -b "$target_branch" FETCH_HEAD; then
+        echo "Error: Couldn't checkout ${target_branch}."
+        exit 1
+    fi
+
+    # Merge
+    git fetch -q origin "$source_branch"
+    if ! git merge "$source_branch"; then
+        # Conflicts
+        git status
+        rm_deleted_by_us
+        rm_deleted_by_them
+        fix_conflicts_using_theirs
+        git commit --no-edit
+    fi
+
+    # Remove any remaining lfs files
+    remove_lfs_files
+    git commit -a --amend --no-edit
+
+    # Update headers
+    update_headers
+    git commit -a -m "Adding AGPL copyright to new files"
+
+    # Push
+    git push origin "$target_branch"
+}
+
+main "$@"