Update main

# Conflicts: # apps/units/cu_cp/cu_cp_application_unit.h # apps/units/cu_cp/cu_cp_application_unit_impl.cpp # apps/units/cu_cp/cu_cp_builder.cpp # apps/units/cu_cp/cu_cp_wrapper.cpp # apps/units/cu_cp/cu_cp_wrapper.h # apps/units/cu_up/cu_up_application_unit.h # apps/units/cu_up/cu_up_application_unit_impl.cpp # apps/units/cu_up/cu_up_wrapper.cpp # apps/units/flexible_du/CMakeLists.txt # apps/units/flexible_du/flexible_du_application_unit.h # apps/units/flexible_du/split_6/CMakeLists.txt # apps/units/flexible_du/split_6/split6_du_factory.h # apps/units/flexible_du/split_6/split6_du_unit_cli11_schema.h # apps/units/flexible_du/split_6/split6_du_unit_config_validator.h # apps/units/flexible_du/split_7_2/CMakeLists.txt # apps/units/flexible_du/split_7_2/split_7_2_du_application_unit_impl.cpp # apps/units/flexible_du/split_7_2/split_7_2_du_factory.cpp # apps/units/flexible_du/split_7_2/split_7_2_du_factory.h # apps/units/flexible_du/split_7_2/split_7_2_du_unit_cli11_schema.h # apps/units/flexible_du/split_8/CMakeLists.txt # apps/units/flexible_du/split_8/split_8_du_application_unit_impl.cpp # apps/units/flexible_du/split_8/split_8_du_factory.h # apps/units/flexible_du/split_8/split_8_du_unit_cli11_schema.h # apps/units/flexible_du/split_8/split_8_du_unit_config_validator.h # apps/units/flexible_du/split_dynamic/CMakeLists.txt # apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.cpp # apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.h # apps/units/flexible_du/split_dynamic/dynamic_du_factory.h # apps/units/flexible_du/split_dynamic/dynamic_du_unit_cli11_schema.h # apps/units/flexible_du/split_dynamic/dynamic_du_unit_config_validator.h # apps/units/flexible_du/split_dynamic/multicell_dynamic_du_factory.h # apps/units/flexible_du/split_helpers/flexible_du_factory.h # apps/units/flexible_du/split_helpers/multicell_flexible_du_factory.h # tests/unittests/phy/upper/channel_processors/pucch/pucch_demodulator_format3_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch/pucch_demodulator_format4_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pucch_estimator_test_data.tar.gz # tests/unittests/scheduler/test_utils/scheduler_test_bench.h
srsran · Dec 2, 2024 · cda0033 · cda0033
2 parents 9c2976b + 5510039
commit cda0033
Show file tree

Hide file tree

Showing 628 changed files with 13,257 additions and 5,179 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ trigger builder:
   stage: ci
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-builder/
-      when: never  
+      when: never
     - if: $ON_MR
       changes:
         paths:
@@ -103,7 +103,7 @@ trigger docker:
   stage: ci
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-docker/
-      when: never  
+      when: never
     - if: $ON_MR
       changes:
         paths:
@@ -132,8 +132,6 @@ matlab nightly:
         CI_DESCRIPTION: Nightly
         SRSRAN_COMMIT: $CI_COMMIT_SHA
         NOTIFY_SLACK: "true"
-      when: delayed
-      start_in: 5 hours
   inherit:
     variables: false
   trigger:
@@ -149,8 +147,6 @@ plugin nightly:
         CI_DESCRIPTION: Nightly
         SRSRAN_COMMIT: $CI_COMMIT_SHA
         NOTIFY_SLACK: "true"
-      when: delayed
-      start_in: 7 hours
   inherit:
     variables: false
   trigger:
@@ -166,33 +162,12 @@ matlab weekly:
         CI_DESCRIPTION: Weekly
         SRSRAN_COMMIT: $CI_COMMIT_SHA
         NOTIFY_SLACK: "true"
-      when: delayed
-      start_in: 20 hours
   inherit:
     variables: false
   trigger:
     project: softwareradiosystems/srsgnb_matlab
     branch: master
 
-helm weekly:
-  stage: ci
-  rules:
-    - if: $CI_DESCRIPTION =~ /Weekly/
-      variables:
-        ON_SCHEDULE: "true"
-        CI_DESCRIPTION: Synchronization with srsGNB
-        NOTIFY_SLACK: "true"
-      when: delayed
-      start_in: 20 hours
-  inherit:
-    variables: false
-  trigger:
-    project: softwareradiosystems/ci/srsgnb_k8s
-    branch: main
-  needs:
-    - job: trigger docker
-      artifacts: false
-
 ################################################################################
 ## Static
 ################################################################################

diff --git a/.gitlab/ci-shared/build.yml b/.gitlab/ci-shared/build.yml
@@ -16,7 +16,6 @@ variables:
     options:
       - "ubuntu-24.10"
       - "ubuntu-24.04"
-      - "ubuntu-23.10"
       - "ubuntu-22.04"
       - "debian-12"
       - "debian-11"
@@ -75,6 +74,8 @@ variables:
     KUBERNETES_CPU_LIMIT: 6
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 12Gi
+    KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "40G"
+    KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "40G"
   tags:
     - ${INFRASTRUCTURE_TAG}
   before_script:

diff --git a/.gitlab/ci-shared/e2e.yml b/.gitlab/ci-shared/e2e.yml
@@ -47,7 +47,7 @@ variables:
       dotenv: ${SRSRANDIR}/.gitlab/ci/e2e/.env
 
 .prepare_test:
-  variables:
+  variables: &setup_kube_variables
     KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
     KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
   before_script: &setup_kube_config
@@ -75,13 +75,10 @@ variables:
     KUBERNETES_MEMORY_LIMIT: 2Gi
     KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "20G"
     KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "20G"
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
-    KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
+    <<: *setup_kube_variables
     GROUP: zmq
   tags:
     - "${RETINA_TAG}"
-  extends:
-    - .prepare_test
   artifacts:
     paths:
       - ${SRSRANDIR}/tests/e2e/log
@@ -90,6 +87,7 @@ variables:
     reports:
       junit: ${SRSRANDIR}/tests/e2e/out.xml
   script:
+    - *setup_kube_config
     - |
       # Print E2E parameters
       echo "GROUP=${GROUP}"