Skip to content

Commit 4d9f223

Browse files
author
codebot
committed
Update main
# Conflicts: # lib/cu_up/cu_up_executor_mapper.cpp # lib/scheduler/ue_scheduling/ue_srb0_scheduler.cpp # lib/scheduler/ue_scheduling/ue_srb0_scheduler.h # 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/signal_processors/dmrs_pusch_estimator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz # tests/unittests/scheduler/ue_scheduling/srb0_scheduler_test.cpp
2 parents 6c99b7d + 1bfa904 commit 4d9f223

File tree

323 files changed

+9408
-4428
lines changed

Some content is hidden

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

323 files changed

+9408
-4428
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Checks: '-*,
2222
-misc-unused-parameters,
2323
-misc-use-anonymous-namespace,
2424
-misc-non-private-member-variables-in-classes,
25+
-misc-include-cleaner,
2526
modernize-*,
2627
-modernize-avoid-c-arrays,
2728
-modernize-use-trailing-return-type,

.gitlab/ci/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ intermediate commits:
544544
SAVE_ARTIFACTS: "True"
545545
script:
546546
- git config advice.detachedHead false
547-
- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
547+
- git fetch origin --depth=20 $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
548548
- |
549549
TEST_MODE=none
550550
for rev in $(git rev-list --reverse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME..origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
@@ -1777,8 +1777,6 @@ basic avx512 dpdk:
17771777
extends: .build_and_unit
17781778
rules:
17791779
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1780-
when: manual
1781-
allow_failure: true
17821780
retry: 2
17831781
interruptible: false
17841782
variables:

.gitlab/ci/e2e.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,6 @@ android n300:
517517
viavi:
518518
stage: rf
519519
extends: .e2e-run
520-
when: manual
521-
allow_failure: true
522520
variables:
523521
GROUP: "viavi"
524522
TESTBED: "viavi"

.gitlab/ci/e2e/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.44.2
3+
RETINA_VERSION=0.45.0
44
UBUNTU_VERSION=24.04
55
AMARISOFT_VERSION=2023-09-08
66
SRSUE_VERSION=23.11

.gitlab/ci/e2e/retina_request_android_n300.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
requirements:
3131
arch: amd64
3232
cpu:
33-
requests: 12
34-
limits: 12
33+
requests: 10
34+
limits: 10
3535
memory:
36-
requests: "24G"
37-
limits: "24G"
36+
requests: "14G"
37+
limits: "14G"
3838
ephemeral-storage:
3939
requests: "6G"
4040
limits: "6G"
41-
taints: ["retina"]
41+
taints: ["manual-testing"]
4242
resources:
4343
- type: sdr
4444
model: n3xx

.gitlab/ci/e2e/retina_request_android_x300.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
requirements:
3131
arch: amd64
3232
cpu:
33-
requests: 12
34-
limits: 12
33+
requests: 10
34+
limits: 10
3535
memory:
36-
requests: "24G"
37-
limits: "24G"
36+
requests: "14G"
37+
limits: "14G"
3838
ephemeral-storage:
3939
requests: "6G"
4040
limits: "6G"
41-
taints: ["retina"]
41+
taints: ["manual-testing"]
4242
resources:
4343
- type: sdr
4444
model: x300

.gitlab/ci/e2e/retina_request_test_mode.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
limits: "6G"
2424
resources:
2525
- type: zmq
26-
nof_ant: 4
26+
nof_antennas_dl: 4
27+
nof_antennas_ul: 4
2728
environment:
2829
- PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
2930
shared_files:

.gitlab/ci/e2e/retina_request_viavi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
requirements:
1313
arch: amd64
1414
cpu:
15-
requests: 18
15+
requests: 20
1616
memory:
1717
requests: "64G"
1818
limits: "64G"
1919
hugepages-1Gi:
20-
requests: 2Gi
21-
limits: 2Gi
20+
requests: 4Gi
21+
limits: 4Gi
2222
ephemeral-storage:
2323
requests: "20G"
2424
limits: "20G"

.gitlab/ci/e2e/retina_request_zmq.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@
4141
requests: 1
4242
memory:
4343
requests: "8G"
44-
limits: "8G"
4544
ephemeral-storage:
46-
requests: "6G"
47-
limits: "6G"
45+
requests: "15G"
46+
limits: "15G"
4847
resources:
4948
- type: zmq
5049
environment:

.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
limits: "6G"
2323
resources:
2424
- type: zmq
25-
nof_ant: 4
25+
nof_antennas_dl: 4
26+
nof_antennas_ul: 4
2627
- type: license
2728
model: amarisoft-5g
2829
shared_files:
@@ -41,13 +42,13 @@
4142
requests: 1
4243
memory:
4344
requests: "8G"
44-
limits: "8G"
4545
ephemeral-storage:
4646
requests: "6G"
4747
limits: "6G"
4848
resources:
4949
- type: zmq
50-
nof_ant: 4
50+
nof_antennas_dl: 4
51+
nof_antennas_ul: 4
5152
environment:
5253
- PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
5354
shared_files:

0 commit comments

Comments
 (0)