Skip to content

Commit cdc93a6

Browse files
author
codebot
committed
Update main
# Conflicts: # lib/cu_cp/adapters/rrc_du_adapters.h
2 parents 11c9bba + 3ae07b5 commit cdc93a6

File tree

245 files changed

+5806
-2278
lines changed

Some content is hidden

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

245 files changed

+5806
-2278
lines changed

‎.gitlab/ci-shared/e2e.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@ variables:
33
description: Retina Testbed Description
44
options:
55
- "zmq"
6-
- "zmq_uesim"
76
- "zmq_deb"
8-
- "zmq_srsue"
97
- "zmq_cudu"
108
- "zmq_cu2du"
9+
- "zmq_srsue"
10+
- "zmq_ric"
11+
- "zmq_ntn"
12+
- "zmq_uesim"
13+
- "s72_uesim"
1114
- "rf_b200"
12-
- "rf_hp"
1315
- "android_b200"
1416
- "android_x300"
17+
- "android_callbox"
1518
- "viavi"
19+
- "test_mode"
20+
- "test_mode_acc100"
1621
- "none"
1722
value: "zmq"
1823
E2E_FILE_OR_DIR:

‎.gitlab/ci/builders/archlinux/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# the distribution.
77
#
88

9-
ARG VERSION=base-20250824.0.410029
9+
ARG VERSION=base-20250914.0.420821
1010
FROM archlinux:$VERSION
1111

1212
ADD install_dependencies.sh /usr/local/bin

‎.gitlab/ci/e2e.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ custom e2e:
7878
needs:
7979
- *retina-needs
8080
- custom build
81-
- build trx driver
81+
- job: custom zmq driver
82+
artifacts: true
83+
optional: true
8284
interruptible: false # Web jobs are standalone
8385

8486
################################################################################
@@ -256,7 +258,20 @@ amari 32UE:
256258
"tcp and not band:3 and not precoding",
257259
"tcp and not band:3 and precoding",
258260
]
259-
- E2E_FILE_OR_DIR: tests/pucch.py
261+
262+
amari 32UE [tests/pucch.py]:
263+
extends: .zmq
264+
variables:
265+
TESTBED: zmq_ntn
266+
MARKERS: "zmq and not smoke"
267+
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
268+
E2E_FILE_OR_DIR: tests/pucch.py
269+
needs:
270+
- job: basic relwithdeb
271+
artifacts: true
272+
- job: build amariue ntn zmq driver
273+
artifacts: true
274+
- *retina-needs
260275

261276
amari 32UE [ping]:
262277
extends: .zmq-uesim
@@ -445,8 +460,6 @@ test mode ru acc100:
445460
test mode ue many ues:
446461
extends: test mode ru
447462
variables:
448-
GROUP: viavi
449-
TESTBED: viavi
450463
MARKERS: test_mode_many_ues
451464
KEYWORDS: test_mode_many_ues
452465
E2E_LOG_LEVEL: warning

‎.gitlab/ci/e2e/.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.85.0
3+
RETINA_VERSION=0.85.2
44
UBUNTU_VERSION=24.04
55
AMARISOFT_VERSION=2023-09-08
6-
AMARISOFT_S72_NTN_VERSION=2024-12-13
6+
AMARISOFT_S72_NTN_VERSION=2025-09-19
77
SRSUE_VERSION=23.11
88
OPEN5GS_VERSION=2.7.0
99
FLEXRIC_VERSION=br-flexric

‎.gitlab/ci/e2e/viavi.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
requests: "1G"
5151
labels: ["kubernetes.io/hostname=k8s-worker-uhd1"]
5252
environment:
53-
- TELEGRAF_INPUT_INTERVAL: 1s
54-
- TELEGRAF_OUTPUT_INTERVAL: 30s
55-
- TELEGRAF_BUFFER_LIMIT: "50000"
56-
- INFLUXDB3_RATE_LIMIT: 5MB
57-
- INFLUXDB3_RATE_LIMIT_PERIOD: 5m
58-
- INFLUXDB3_EXTERNAL_URL: ${RETINA_METRICS_SERVER_URL}
59-
- INFLUXDB3_BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
53+
- TELEGRAF_INPUT_INTERVAL: ${TELEGRAF_INPUT_INTERVAL}
54+
- TELEGRAF_OUTPUT_INTERVAL: ${TELEGRAF_OUTPUT_INTERVAL}
55+
- TELEGRAF_BUFFER_LIMIT: "${TELEGRAF_BUFFER_LIMIT}"
56+
- INFLUXDB3_RATE_LIMIT: "${INFLUXDB3_RATE_LIMIT}"
57+
- INFLUXDB3_RATE_LIMIT_PERIOD: ${INFLUXDB3_RATE_LIMIT_PERIOD}
58+
- INFLUXDB3_EXTERNAL_URL: ${INFLUXDB3_EXTERNAL_URL}
59+
- INFLUXDB3_BUCKET: ${INFLUXDB3_BUCKET}
6060
- INFLUXDB3_TESTBED: ${CI_JOB_NAME_SLUG}
61-
- INFLUXDB3_AUTH_TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
61+
- INFLUXDB3_AUTH_TOKEN: ${INFLUXDB3_AUTH_TOKEN}
6262
image: registry.gitlab.com/softwareradiosystems/srsgnb/telegraf:${SRS_TELEGRAF_VERSION}

‎.gitlab/ci/plugin_version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e1d32be4c77a1ec2599e7f0f56c6e89dbafc7946
1+
39172531423f6f99817db30e40a2534c860a3f96

‎.gitlab/ci/trx.yml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ build trx driver:
3131
- if: $ON_MR == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
3232
when: never
3333
- if: $ON_MR
34-
- if: $ON_WEB
35-
- if: $ON_API
3634
retry: 2
3735
script:
3836
- |
@@ -108,4 +106,28 @@ build amariue ntn zmq driver:
108106
rules:
109107
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
110108
variables:
111-
AMARISOFT_VERSION: "2024-12-13"
109+
AMARISOFT_VERSION: "2025-09-19"
110+
111+
custom zmq driver:
112+
extends: build trx driver
113+
rules:
114+
- if: $ON_MR
115+
when: never
116+
- if: $ON_DEFAULT_BRANCH
117+
when: never
118+
- if: $ON_SCHEDULE
119+
when: never
120+
- if: $ON_TAG
121+
when: never
122+
- if: $GROUP == "viavi" || $GROUP == "rf"
123+
when: never
124+
- if: $GROUP == "uesim"
125+
variables:
126+
OS: fedora-39
127+
AMARISOFT_VERSION: "2024-03-15"
128+
- if: $TESTBED == "zmq_ntn"
129+
variables:
130+
AMARISOFT_VERSION: "2025-09-19"
131+
- if: $TESTBED != ""
132+
variables:
133+
AMARISOFT_VERSION: "2023-09-08"

‎.gitlab/run_viavi_pipeline.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ def run_test(args_definition: _ArgsDefinition, test_definition: _TestDefinition)
184184
{"key": "RETINA_PARAM_ARGS", "value": "gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.rlc_rb_type=srb"},
185185
{"key": "E2E_LOG_LEVEL", "value": "warning"},
186186
{"key": "GROUP", "value": "viavi"},
187+
{"key": "CLUSTER", "value": "retina-e2e-amd64"},
187188
{"key": "PIPELINE_DESCRIPTION", "value": "Viavi manual test"},
188189
]
189190

‎CHANGELOG‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Change Log for Releases
22
=======================
33

4+
## 25.10
5+
- Reworked threading and execution model to support more deployment use-cases
6+
- Added separate applications for CU-CP and CU-UP
7+
- Updated E1AP ASN1 to Release 18.5
8+
- New WebSocket interface for metrics reporting and remote commands
9+
- PDCP transmit parallelization for security processing
10+
- Added new OFH parameter to set RU reference level
11+
- Added automatic SBOM generation
12+
- Itensified CI coverage and testing
13+
- Simplified and aligned Docker/Helm configs, moved metrics to telegraf
14+
- Other bug-fixes and improved stability and performance in all parts
15+
416
## 25.04
517
- PUCCH format F3 and F4
618
- Single layer closed loop UL-MIMO using Sounding Reference Signals (SRS)

‎apps/helpers/e2/e2_cli11_schema.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static void configure_cli11_e2_args(CLI::App& app,
4646
->capture_default_str();
4747
add_option(app, "--e2sm_kpm_enabled", e2_params.e2sm_kpm_enabled, "Enable KPM service module")->capture_default_str();
4848
add_option(app, "--e2sm_rc_enabled", e2_params.e2sm_rc_enabled, "Enable RC service module")->capture_default_str();
49+
add_option(app, "--e2sm_ccc_enabled", e2_params.e2sm_ccc_enabled, "Enable CCC service module")->capture_default_str();
4950
}
5051

5152
void srsran::configure_cli11_with_e2_config_schema(CLI::App& app,

0 commit comments

Comments
 (0)