Update main

# Conflicts: # apps/units/flexible_du/du_high/du_high_wrapper_config_helper.h # apps/units/flexible_du/du_low/du_low_wrapper_config_helper.h # apps/units/flexible_du/split_7_2/split_7_2_du_impl.cpp # apps/units/flexible_du/split_7_2/split_7_2_du_impl.h # apps/units/flexible_du/split_8/split_8_du_impl.cpp # apps/units/flexible_du/split_8/split_8_du_impl.h # include/srsran/du/du_high/du_high_wrapper_factory.h # include/srsran/du/du_wrapper.h # include/srsran/du/du_wrapper_config.h # include/srsran/mac/time_alignment_group_config.h # include/srsran/support/event_tracing.h # lib/du/du_high/du_high_executor_strategies.h # lib/du/du_wrapper_factory.cpp # lib/du/du_wrapper_impl.cpp # lib/support/event_tracing.cpp # tests/unittests/phy/upper/equalization/channel_equalizer_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pusch_estimator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz
srsran · Nov 6, 2024 · 74be182 · 74be182
2 parents 3d1caed + 9a8757c
commit 74be182
Show file tree

Hide file tree

Showing 963 changed files with 17,918 additions and 10,376 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -19,8 +19,12 @@ jobs:
         compiler: [gcc, clang]
     steps:
     - uses: actions/checkout@v3
-    - name: Build srsRAN Project on x86 ${{ matrix.os }}
+    - name: Install Dependencies
       run: |
-        sudo apt update
-        sudo apt install -y cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-dev ninja-build
-        mkdir build && cd build && cmake -DENABLE_UHD=False -GNinja .. && ninja && ctest
+        sudo docker/scripts/install_dependencies.sh
+    - name: Build srsRAN Project on x86 ${{ matrix.os }} with compiler ${{ matrix.compiler }}
+      run: |
+        docker/scripts/builder.sh -c ${{ matrix.compiler }} -m "-j$(nproc)" .
+    - name: Run unit tests
+      run: |
+        cd build && ctest -j$(nproc) --schedule-random --output-on-failure
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   docker:
+    if: ${{ vars.SKIP_DOCKER_JOB != 'true' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -143,4 +144,4 @@ jobs:
             NAME="${{ env.NAME }}"
             LIB=${{ matrix.LIB }}
             LIB_VERSION=${{ matrix.LIB_VERSION }}
-            MARCH=${{ matrix.MARCH }}
+            MARCH=${{ matrix.MARCH }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -53,9 +53,14 @@ stages:
   - rf
   - manual
   - documentation
+  # release
+  - pre private
   - private
+  - post private
   - public
+  - post public
   - release
+  - post release
 
 variables:
   SLACK_CHANNEL_OK: "#ci_gnb"
@@ -128,14 +133,14 @@ matlab nightly:
         SRSRAN_COMMIT: $CI_COMMIT_SHA
         NOTIFY_SLACK: "true"
       when: delayed
-      start_in: 3 hours
+      start_in: 5 hours
   inherit:
     variables: false
   trigger:
     project: softwareradiosystems/srsgnb_matlab
     branch: master
 
-enterprise nightly:
+plugin nightly:
   stage: ci
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
@@ -145,11 +150,11 @@ enterprise nightly:
         SRSRAN_COMMIT: $CI_COMMIT_SHA
         NOTIFY_SLACK: "true"
       when: delayed
-      start_in: 3 hours
+      start_in: 7 hours
   inherit:
     variables: false
   trigger:
-    project: softwareradiosystems/srsran_5g_enterprise
+    project: ${PLUGIN_REPO}
     branch: main
 
 matlab weekly:

diff --git a/.gitlab/ci-shared/build.yml b/.gitlab/ci-shared/build.yml
@@ -121,15 +121,15 @@ variables:
     - |
       launch_tests_srsran() {
         cd ${SRSRANDIR}/build
-        echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+        echo "Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
         set -x
         ctest -j${KUBERNETES_CPU_REQUEST} --schedule-random --output-on-failure --output-junit xunit.xml "$@"
         { set +x; } 2>/dev/null
       }
     - |
       launch_tests_plugin() {
         cd ${CI_PROJECT_DIR}/build
-        echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+        echo "Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
         set -x
         ctest -j${KUBERNETES_CPU_REQUEST} --schedule-random --output-on-failure --output-junit xunit.xml "$@"
         { set +x; } 2>/dev/null