Skip to content

Commit cda0033

Browse files
author
codebot
committed
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
2 parents 9c2976b + 5510039 commit cda0033

File tree

628 files changed

+13257
-5179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

628 files changed

+13257
-5179
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ trigger builder:
8888
stage: ci
8989
rules:
9090
- if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-builder/
91-
when: never
91+
when: never
9292
- if: $ON_MR
9393
changes:
9494
paths:
@@ -103,7 +103,7 @@ trigger docker:
103103
stage: ci
104104
rules:
105105
- if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-docker/
106-
when: never
106+
when: never
107107
- if: $ON_MR
108108
changes:
109109
paths:
@@ -132,8 +132,6 @@ matlab nightly:
132132
CI_DESCRIPTION: Nightly
133133
SRSRAN_COMMIT: $CI_COMMIT_SHA
134134
NOTIFY_SLACK: "true"
135-
when: delayed
136-
start_in: 5 hours
137135
inherit:
138136
variables: false
139137
trigger:
@@ -149,8 +147,6 @@ plugin nightly:
149147
CI_DESCRIPTION: Nightly
150148
SRSRAN_COMMIT: $CI_COMMIT_SHA
151149
NOTIFY_SLACK: "true"
152-
when: delayed
153-
start_in: 7 hours
154150
inherit:
155151
variables: false
156152
trigger:
@@ -166,33 +162,12 @@ matlab weekly:
166162
CI_DESCRIPTION: Weekly
167163
SRSRAN_COMMIT: $CI_COMMIT_SHA
168164
NOTIFY_SLACK: "true"
169-
when: delayed
170-
start_in: 20 hours
171165
inherit:
172166
variables: false
173167
trigger:
174168
project: softwareradiosystems/srsgnb_matlab
175169
branch: master
176170

177-
helm weekly:
178-
stage: ci
179-
rules:
180-
- if: $CI_DESCRIPTION =~ /Weekly/
181-
variables:
182-
ON_SCHEDULE: "true"
183-
CI_DESCRIPTION: Synchronization with srsGNB
184-
NOTIFY_SLACK: "true"
185-
when: delayed
186-
start_in: 20 hours
187-
inherit:
188-
variables: false
189-
trigger:
190-
project: softwareradiosystems/ci/srsgnb_k8s
191-
branch: main
192-
needs:
193-
- job: trigger docker
194-
artifacts: false
195-
196171
################################################################################
197172
## Static
198173
################################################################################

.gitlab/ci-shared/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ variables:
1616
options:
1717
- "ubuntu-24.10"
1818
- "ubuntu-24.04"
19-
- "ubuntu-23.10"
2019
- "ubuntu-22.04"
2120
- "debian-12"
2221
- "debian-11"
@@ -75,6 +74,8 @@ variables:
7574
KUBERNETES_CPU_LIMIT: 6
7675
KUBERNETES_MEMORY_REQUEST: 12Gi
7776
KUBERNETES_MEMORY_LIMIT: 12Gi
77+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "40G"
78+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "40G"
7879
tags:
7980
- ${INFRASTRUCTURE_TAG}
8081
before_script:

.gitlab/ci-shared/e2e.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ variables:
4747
dotenv: ${SRSRANDIR}/.gitlab/ci/e2e/.env
4848

4949
.prepare_test:
50-
variables:
50+
variables: &setup_kube_variables
5151
KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
5252
KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
5353
before_script: &setup_kube_config
@@ -75,13 +75,10 @@ variables:
7575
KUBERNETES_MEMORY_LIMIT: 2Gi
7676
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "20G"
7777
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "20G"
78-
KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
79-
KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
78+
<<: *setup_kube_variables
8079
GROUP: zmq
8180
tags:
8281
- "${RETINA_TAG}"
83-
extends:
84-
- .prepare_test
8582
artifacts:
8683
paths:
8784
- ${SRSRANDIR}/tests/e2e/log
@@ -90,6 +87,7 @@ variables:
9087
reports:
9188
junit: ${SRSRANDIR}/tests/e2e/out.xml
9289
script:
90+
- *setup_kube_config
9391
- |
9492
# Print E2E parameters
9593
echo "GROUP=${GROUP}"

0 commit comments

Comments
 (0)