Skip to content

Commit dcd905c

Browse files
author
codebot
committed
Update main
# Conflicts: # lib/hal/dpdk/dpdk_eal.cpp # lib/hal/dpdk/mbuf_pool.cpp # lib/phy/upper/uplink_processor_concurrent.h # tests/unittests/phy/upper/channel_processors/pusch/pusch_decoder_test.cpp
2 parents 60811de + 5efe741 commit dcd905c

File tree

416 files changed

+11111
-3900
lines changed

Some content is hidden

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

416 files changed

+11111
-3900
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ trigger docker:
8585
changes:
8686
paths:
8787
- .gitlab/ci/docker.yml
88-
- docker/**/*
88+
- docker/**/*.{yml,env,json,toml,py,sh,csv}
89+
- docker/**/Dockerfile
8990
trigger:
9091
include: .gitlab/ci/docker.yml
9192
strategy: depend

‎.gitlab/ci/build.yml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ variables:
3333
INFRASTRUCTURE_TAG:
3434
description: Computer architecture and supported instruction sets
3535
options:
36-
- "aws-spot-amd64"
37-
- "aws-spot-arm64"
3836
- "on-prem-amd64"
3937
- "on-prem-arm64"
38+
- "aws-spot-amd64"
39+
- "aws-spot-arm64"
4040
value: "aws-spot-amd64"
4141
OS:
4242
description: Operating system
@@ -74,6 +74,9 @@ variables:
7474
UHD_VERSION:
7575
description: must be one version supported in the specified OS
7676
value: ""
77+
DPDK_VERSION:
78+
description: must be one version supported in the specified OS
79+
value: ""
7780

7881
################
7982
# Build caches #
@@ -738,6 +741,32 @@ basic asan:
738741
<<: *build_artifacts
739742
expire_in: 1 day
740743

744+
basic avx512 dpdk:
745+
extends: .build_and_unit
746+
rules:
747+
- if: $CI_DESCRIPTION =~ /Nightly/
748+
when: delayed
749+
start_in: 30 minutes
750+
retry: 2
751+
interruptible: false
752+
variables:
753+
OS: ubuntu-22.04
754+
COMPILER: gcc
755+
BUILD_TYPE: RelWithDebInfo
756+
TEST_MODE: default
757+
ASSERT_LEVEL: PARANOID
758+
ENABLE_UHD: "False"
759+
ENABLE_ZEROMQ: "False"
760+
ENABLE_DPDK: "True"
761+
DPDK_VERSION: "23.07"
762+
AUTO_DETECT_ISA: "True"
763+
ENABLE_AVX512: "True"
764+
SAVE_ARTIFACTS: "True"
765+
tags: ["${AMD64_AVX512_TAG}"]
766+
artifacts:
767+
<<: *build_artifacts
768+
expire_in: 1 day
769+
741770
# Packaging
742771

743772
package:

‎.gitlab/ci/e2e.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ variables:
3636
- "android_b200"
3737
- "android_n300"
3838
- "android_x300"
39+
- "viavi"
3940
- "none"
4041
value: "zmq"
4142
MARKERS:
@@ -312,11 +313,13 @@ rf-asan:
312313
- job: "basic asan"
313314
artifacts: true
314315
- *retina-needs
316+
allow_failure: true
315317

316318
rf-b200-config:
317319
extends: .rf
318320
variables:
319321
MARKERS: "rf_b200"
322+
allow_failure: true
320323

321324
rf-n300-config:
322325
extends: .rf
@@ -363,6 +366,29 @@ android-n300:
363366
variables:
364367
TESTBED: "android_n300"
365368

369+
################################################################################
370+
# VIAVI
371+
###############################################################################
372+
373+
viavi:
374+
extends: .e2e-run
375+
rules:
376+
- if: $CI_DESCRIPTION =~ /Nightly/
377+
when: manual
378+
allow_failure: true
379+
# when: delayed
380+
# start_in: 7 hours
381+
variables:
382+
GROUP: "viavi"
383+
TESTBED: "viavi"
384+
MARKERS: "viavi"
385+
E2E_LOG_LEVEL: "warning"
386+
KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
387+
needs:
388+
- job: "basic avx512 dpdk"
389+
artifacts: true
390+
- *retina-needs
391+
366392
################################################################################
367393
# Garbage collector
368394
################################################################################

‎.gitlab/ci/e2e/.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +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.37.13
3+
RETINA_VERSION=0.38.0
44
AMARISOFT_VERSION=2023-03-17
55
SRSUE_VERSION=23.11
66
OPEN5GS_VERSION=2.5.6
77
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8-
METRICS_SERVER_VERSION=1.4.0
8+
METRICS_SERVER_VERSION=1.5.0
9+
DPDK_VERSION=23.07

‎.gitlab/ci/e2e/retina_request_android_b200.yml‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
requests: "2G"
1919
limits: "2G"
2020
ephemeral-storage:
21-
requests: "3G"
22-
limit: "3G"
21+
requests: "6G"
22+
limits: "6G"
2323
resources:
2424
- type: android
2525
model: one-plus-9-pro
@@ -36,8 +36,8 @@
3636
requests: "10G"
3737
limits: "10G"
3838
ephemeral-storage:
39-
requests: "3G"
40-
limit: "3G"
39+
requests: "6G"
40+
limits: "6G"
4141
resources:
4242
- type: sdr
4343
model: b200
@@ -60,23 +60,5 @@
6060
requests: "4G"
6161
limits: "4G"
6262
ephemeral-storage:
63-
requests: "3G"
64-
limit: "3G"
65-
66-
- name: metrics-server
67-
type: generic
68-
requirements:
69-
arch: amd64
70-
cpu:
71-
requests: 1
72-
memory:
73-
requests: "500Mi"
74-
ephemeral-storage:
75-
requests: "1G"
76-
environment:
77-
- URL: ${RETINA_METRICS_SERVER_URL}
78-
- ORG: ${RETINA_METRICS_SERVER_ORG}
79-
- BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
80-
- TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
81-
- TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
82-
image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
63+
requests: "6G"
64+
limits: "6G"

‎.gitlab/ci/e2e/retina_request_android_n300.yml‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
requests: "2G"
1919
limits: "2G"
2020
ephemeral-storage:
21-
requests: "3G"
22-
limit: "3G"
21+
requests: "6G"
22+
limits: "6G"
2323
resources:
2424
- type: android
2525
model: one-plus-9-pro
@@ -36,8 +36,8 @@
3636
requests: "24G"
3737
limits: "24G"
3838
ephemeral-storage:
39-
requests: "3G"
40-
limit: "3G"
39+
requests: "6G"
40+
limits: "6G"
4141
taints: ["retina"]
4242
resources:
4343
- type: sdr
@@ -61,23 +61,5 @@
6161
requests: "4G"
6262
limits: "4G"
6363
ephemeral-storage:
64-
requests: "3G"
65-
limit: "3G"
66-
67-
- name: metrics-server
68-
type: generic
69-
requirements:
70-
arch: amd64
71-
cpu:
72-
requests: 1
73-
memory:
74-
requests: "500Mi"
75-
ephemeral-storage:
76-
requests: "1G"
77-
environment:
78-
- URL: ${RETINA_METRICS_SERVER_URL}
79-
- ORG: ${RETINA_METRICS_SERVER_ORG}
80-
- BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
81-
- TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
82-
- TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
83-
image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
64+
requests: "6G"
65+
limits: "6G"

‎.gitlab/ci/e2e/retina_request_android_x300.yml‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
requests: "2G"
1919
limits: "2G"
2020
ephemeral-storage:
21-
requests: "3G"
22-
limit: "3G"
21+
requests: "6G"
22+
limits: "6G"
2323
resources:
2424
- type: android
2525
model: one-plus-9-pro
@@ -36,8 +36,8 @@
3636
requests: "24G"
3737
limits: "24G"
3838
ephemeral-storage:
39-
requests: "3G"
40-
limit: "3G"
39+
requests: "6G"
40+
limits: "6G"
4141
taints: ["retina"]
4242
resources:
4343
- type: sdr
@@ -61,23 +61,5 @@
6161
requests: "4G"
6262
limits: "4G"
6363
ephemeral-storage:
64-
requests: "3G"
65-
limit: "3G"
66-
67-
- name: metrics-server
68-
type: generic
69-
requirements:
70-
arch: amd64
71-
cpu:
72-
requests: 1
73-
memory:
74-
requests: "500Mi"
75-
ephemeral-storage:
76-
requests: "1G"
77-
environment:
78-
- URL: ${RETINA_METRICS_SERVER_URL}
79-
- ORG: ${RETINA_METRICS_SERVER_ORG}
80-
- BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
81-
- TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
82-
- TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
83-
image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
64+
requests: "6G"
65+
limits: "6G"

‎.gitlab/ci/e2e/retina_request_rf_b200.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
requests: "12G"
3232
limits: "12G"
3333
ephemeral-storage:
34-
requests: "3G"
35-
limit: "3G"
34+
requests: "6G"
35+
limits: "6G"
3636
resources:
3737
- type: sdr
3838
model: b200
@@ -52,7 +52,7 @@
5252
limits: "12G"
5353
ephemeral-storage:
5454
requests: "9G"
55-
limit: "9G"
55+
limits: "9G"
5656
resources:
5757
- type: sdr
5858
model: b200
@@ -75,5 +75,5 @@
7575
requests: "4G"
7676
limits: "4G"
7777
ephemeral-storage:
78-
requests: "3G"
79-
limit: "3G"
78+
requests: "6G"
79+
limits: "6G"

‎.gitlab/ci/e2e/retina_request_viavi.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#
2+
# Copyright 2013-2023 Software Radio Systems Limited
3+
#
4+
# By using this file, you agree to the terms and conditions set
5+
# forth in the LICENSE file which can be found at the top level of
6+
# the distribution.
7+
#
8+
9+
- name: srs-gnb
10+
type: gnb
11+
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
12+
requirements:
13+
arch: amd64
14+
cpu:
15+
requests: 22
16+
limits: 22
17+
memory:
18+
requests: "64G"
19+
limits: "64G"
20+
hugepages-1Gi:
21+
requests: 2Gi
22+
limits: 2Gi
23+
ephemeral-storage:
24+
requests: "9G"
25+
limits: "9G"
26+
taints: ["ci-amd64-avx512-onprem"]
27+
resources:
28+
- type: emulator
29+
model: viavi
30+
- type: ru
31+
model: viavi
32+
environment:
33+
- PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
34+
- LD_LIBRARY_PATH: /opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
35+
shared_files:
36+
- local_path: ../../build/apps/gnb/gnb
37+
remote_path: /usr/local/bin
38+
is_executable: true
39+
40+
- name: metrics-server
41+
type: generic
42+
requirements:
43+
arch: amd64
44+
cpu:
45+
requests: 1
46+
memory:
47+
requests: "500Mi"
48+
ephemeral-storage:
49+
requests: "1G"
50+
environment:
51+
- URL: ${RETINA_METRICS_SERVER_URL}
52+
- ORG: ${RETINA_METRICS_SERVER_ORG}
53+
- BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
54+
- TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
55+
- TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
56+
image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}

‎.gitlab/ci/e2e/retina_request_zmq.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
memory:
3030
requests: "8G"
3131
ephemeral-storage:
32-
requests: "3G"
33-
limit: "3G"
32+
requests: "6G"
33+
limits: "6G"
3434
resources:
3535
- type: zmq
3636
- type: license
@@ -49,10 +49,10 @@
4949
requests: 1
5050
memory:
5151
requests: "8G"
52-
limit: "8G"
52+
limits: "8G"
5353
ephemeral-storage:
54-
requests: "3G"
55-
limit: "3G"
54+
requests: "6G"
55+
limits: "6G"
5656
resources:
5757
- type: zmq
5858
environment:
@@ -71,6 +71,6 @@
7171
memory:
7272
requests: "4G"
7373
ephemeral-storage:
74-
requests: "3G"
75-
limit: "3G"
74+
requests: "6G"
75+
limits: "6G"
7676
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}

0 commit comments

Comments
 (0)