Skip to content

Commit d90cd4e

Browse files
author
codebot
committed
Update main
# Conflicts: # apps/units/flexible_o_du/split_6/o_du_low/cell_operation_request_impl.h # apps/units/flexible_o_du/split_6/o_du_low/split6_cell_configurator_plugin.h # apps/units/flexible_o_du/split_6/o_du_low/split6_cell_configurator_plugin_dummy.cpp # apps/units/flexible_o_du/split_6/o_du_low/split6_cell_configurator_plugin_dummy.h # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_factory.cpp # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_factory.h # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_impl.cpp # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_impl.h # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_manager.cpp # apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_manager.h # apps/units/flexible_o_du/split_6/o_du_low/split6_slot_configurator_plugin.h # apps/units/flexible_o_du/split_6/o_du_low/split6_slot_configurator_plugin_dummy.cpp # apps/units/flexible_o_du/split_6/o_du_low/split6_slot_configurator_plugin_dummy.h # apps/units/o_cu_cp/cu_cp/metrics/cu_cp_pdcp_metrics.h # apps/units/o_cu_cp/cu_cp/metrics/cu_cp_pdcp_metrics_consumers.cpp # apps/units/o_cu_cp/cu_cp/metrics/cu_cp_pdcp_metrics_consumers.h # docker/metrics_server/Dockerfile # docker/metrics_server/pyproject.toml # docker/metrics_server/src/metrics_server/__main__.py # include/srsran/support/memory_pool/concurrent_thread_local_object_pool.h # lib/fapi/decorator_helpers/slot_error_notifier_dispatcher.cpp # lib/fapi/decorator_helpers/slot_error_notifier_dispatcher.h # lib/fapi/loggers/logging_slot_error_notifier_decorator.cpp # lib/phy/upper/signal_processors/pucch/dmrs_pucch_estimator_format1.cpp # lib/phy/upper/signal_processors/pucch/dmrs_pucch_estimator_format1.h # tests/unittests/f1ap/common/f1ap_cu_test_messages.cpp # tests/unittests/f1ap/common/f1ap_cu_test_messages.h # tests/unittests/fapi_adaptor/adaptor_performance_dl_tti_request.cpp # tests/unittests/phy/upper/channel_processors/pdsch/pdsch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/ssb/ssb_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pucch_estimator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz
2 parents d8bfdc9 + 2ea0811 commit d90cd4e

File tree

815 files changed

+84457
-37604
lines changed

Some content is hidden

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

815 files changed

+84457
-37604
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
# --> metrics server
17+
# --> telegraf
1818
- TAGNAME: ""
19-
REPOSITORY: metrics-server
19+
REPOSITORY: telegraf
2020
EXTRA_CMAKE_ARGS: ""
2121
MARCH: ""
2222
PLATFORM: amd64
2323
UHD_VERSION: ""
2424
DPDK_VERSION: ""
25-
DOCKERFILE: ./docker/metrics_server/Dockerfile
26-
CONTEXT: ./docker/metrics_server
25+
DOCKERFILE: ./docker/telegraf/Dockerfile
26+
CONTEXT: ./docker/telegraf
2727
# --> grafana
2828
- TAGNAME: ""
2929
REPOSITORY: grafana

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@
2525

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "21"
28+
ref: "22"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "21"
31+
ref: "22"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "21"
34+
ref: "22"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "21"
38-
file: .gitlab/ci-shared/tools/test_reporter.yml
39-
- project: softwareradiosystems/ci/tools
40-
ref: "21"
37+
ref: "22"
4138
file: .gitlab/ci-shared/tools/tagger.yml
4239
- local: .gitlab/ci/builders/version.yml
4340
- local: .gitlab/ci/build.yml
@@ -582,7 +579,7 @@ unit coverage:
582579
echo "coverage${metric_prefix},pipeline=${CI_PIPELINE_ID},os=${OS} value=${coverage_value}" >> build/build_time_metrics.txt
583580
- |
584581
influx write --host $INFLUXDB_URL --token $INFLUXDB_TOKEN --org $INFLUXDB_ORG \
585-
--bucket ci --file build/build_time_metrics.txt
582+
--bucket ci --file build/build_time_metrics.txt || true
586583
coverage: /^\s*Line coverage:\s*\d+.\d+\%/
587584
artifacts: &unit_coverage_artifacts
588585
paths:

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ variables:
115115
- |
116116
echo "" >> .gitlab/ci/e2e/.env
117117
cat $RETINA_CONFIG_ENV >> .gitlab/ci/e2e/.env
118+
echo "" >> .gitlab/ci/e2e/.env
119+
printenv | grep CI >> .gitlab/ci/e2e/.env
118120
# Modify request to shared the complete folder with the gnb container
119121
- |
120122
if [ "$CI_JOB_NAME_SLUG" != "smoke-zmq" ] && [ "$TESTBED" != "zmq_deb" ]; then
@@ -135,9 +137,9 @@ variables:
135137
- retina-delete-orchestration-network --user-name ci_${GROUP}
136138
# Push test metrics
137139
- |
138-
find . -iname "test_metrics.csv" -exec \
139-
influx write --host $INFLUXDB_URL --token $INFLUXDB_TOKEN --org $INFLUXDB_ORG \
140-
--bucket ci --file {} \;
140+
find . -iname "test_metrics.csv" -exec sh -c \
141+
'influx write --host "$INFLUXDB_URL" --token "$INFLUXDB_TOKEN" --org "$INFLUXDB_ORG" \
142+
--bucket ci --file "$1" || true' _ {} \;
141143
# Artifact size
142144
- echo -e "\e[0Ksection_start:`date +%s`:e2e_folder_section[collapsed=true]\r\e[0KLog folder's tree"
143145
- |
@@ -160,6 +162,11 @@ variables:
160162
}
161163
print_tree "${SRSRANDIR}/tests/e2e/log/" ""
162164
- echo -e "\e[0Ksection_end:`date +%s`:e2e_folder_section\r\e[0K"
165+
# UI Link
166+
- |
167+
echo "*******************************************************************************************************************************"
168+
echo "UI Link ---> ${RETINA_METRICS_UI_URL}&from=$(date -u -d $CI_JOB_STARTED_AT '+%Y-%m-%dT%H:%M:%S.%3NZ')&to=$(date -u '+%Y-%m-%dT%H:%M:%S.%3NZ')"
169+
echo "*******************************************************************************************************************************"
163170
# Report link
164171
- |
165172
subpath=$(echo "$SRSRANDIR" | sed "s|^$CI_PROJECT_DIR||")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
include:
22
- project: softwareradiosystems/ci/tools
3-
ref: "21"
3+
ref: "22"
44
file: .gitlab/ci-shared/setup/all.yml
55
- project: softwareradiosystems/ci/tools
6-
ref: "21"
6+
ref: "22"
77
file: .gitlab/ci-shared/features/all.yml
88
- local: .gitlab/ci-shared/e2e.yml
99
- local: .gitlab/ci-shared/build.yml

‎.gitlab/ci/build.yml‎

Lines changed: 64 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
include:
1010
- project: softwareradiosystems/ci/srsran_project_packaging
11-
ref: "9"
11+
ref: "10"
1212
file: .gitlab/ci-shared/package.yml
1313
- local: .gitlab/ci-shared/build.yml
1414

@@ -1011,6 +1011,8 @@ rhel-8 amd64 avx2:
10111011
OS: rhel-8
10121012
MARCH: x86-64-v3
10131013
INFRASTRUCTURE_TAG: amd64-avx2
1014+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1015+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
10141016
parallel:
10151017
matrix:
10161018
- <<: *basic_combinations
@@ -1620,6 +1622,8 @@ rhel-8 amd64 native:
16201622
variables:
16211623
OS: rhel-8
16221624
INFRASTRUCTURE_TAG: amd64
1625+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1626+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
16231627
parallel:
16241628
matrix:
16251629
- <<: *basic_combinations
@@ -1635,6 +1639,8 @@ rhel-8 amd64 avx512:
16351639
OS: rhel-8
16361640
MARCH: x86-64-v4
16371641
INFRASTRUCTURE_TAG: amd64-avx2-avx512
1642+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1643+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
16381644
parallel:
16391645
matrix:
16401646
- <<: *basic_combinations
@@ -1649,6 +1655,8 @@ rhel-8 arm native:
16491655
variables:
16501656
OS: rhel-8
16511657
INFRASTRUCTURE_TAG: arm64
1658+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1659+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
16521660
parallel:
16531661
matrix:
16541662
- <<: *basic_combinations
@@ -1664,6 +1672,8 @@ rhel-8 arm neon:
16641672
OS: rhel-8
16651673
MARCH: armv8.2-a+crypto+fp16+dotprod
16661674
INFRASTRUCTURE_TAG: arm64
1675+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1676+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
16671677
parallel:
16681678
matrix:
16691679
- <<: *basic_combinations
@@ -1850,7 +1860,11 @@ basic package:
18501860
basic relwithdeb:
18511861
extends: .build_and_unit
18521862
rules:
1853-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1863+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1864+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1865+
variables:
1866+
ENABLE_FFTW: "False"
1867+
ENABLE_MKL: "True"
18541868
retry: 2
18551869
interruptible: false
18561870
variables:
@@ -1871,7 +1885,11 @@ basic relwithdeb:
18711885
basic tsan:
18721886
extends: .build_and_unit
18731887
rules:
1874-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1888+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1889+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1890+
variables:
1891+
ENABLE_FFTW: "False"
1892+
ENABLE_MKL: "True"
18751893
retry: 2
18761894
interruptible: false
18771895
variables:
@@ -1884,7 +1902,7 @@ basic tsan:
18841902
TEST_MODE: none
18851903
MARCH: x86-64-v3
18861904
INFRASTRUCTURE_TAG: amd64-avx2
1887-
BUILD_ARGS: -DEXIT_TIMEOUT=60
1905+
BUILD_ARGS: -DEXIT_TIMEOUT=120
18881906
after_script:
18891907
- *build_after_script
18901908
artifacts:
@@ -1894,7 +1912,11 @@ basic tsan:
18941912
basic asan:
18951913
extends: .build_and_unit
18961914
rules:
1897-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1915+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1916+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1917+
variables:
1918+
ENABLE_FFTW: "False"
1919+
ENABLE_MKL: "True"
18981920
retry: 2
18991921
interruptible: false
19001922
variables:
@@ -1907,30 +1929,7 @@ basic asan:
19071929
TEST_MODE: none
19081930
MARCH: x86-64-v3
19091931
INFRASTRUCTURE_TAG: amd64-avx2
1910-
BUILD_ARGS: -DEXIT_TIMEOUT=60
1911-
after_script:
1912-
- *build_after_script
1913-
artifacts:
1914-
<<: *build_artifacts
1915-
expire_in: 3 days
1916-
1917-
basic rtsan:
1918-
extends: .build_and_unit
1919-
rules:
1920-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1921-
retry: 2
1922-
interruptible: false
1923-
variables:
1924-
SRS_TARGET: gnb
1925-
OS: ubuntu-24.04-rtsan
1926-
COMPILER: clang
1927-
CMAKE_BUILD_TYPE: Debug
1928-
ASSERT_LEVEL: PARANOID
1929-
ENABLE_RTSAN: "True"
1930-
ENABLE_WERROR: "False"
1931-
TEST_MODE: none
1932-
MARCH: x86-64-v3
1933-
INFRASTRUCTURE_TAG: amd64-avx2
1932+
BUILD_ARGS: -DEXIT_TIMEOUT=120
19341933
after_script:
19351934
- *build_after_script
19361935
artifacts:
@@ -1940,7 +1939,11 @@ basic rtsan:
19401939
basic memcheck:
19411940
extends: .build_and_unit
19421941
rules:
1943-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1942+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1943+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1944+
variables:
1945+
ENABLE_FFTW: "False"
1946+
ENABLE_MKL: "True"
19441947
retry: 2
19451948
interruptible: false
19461949
variables:
@@ -1961,7 +1964,11 @@ basic memcheck:
19611964
basic ru dummy:
19621965
extends: .build_and_unit
19631966
rules:
1964-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1967+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1968+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1969+
variables:
1970+
ENABLE_FFTW: "False"
1971+
ENABLE_MKL: "True"
19651972
retry: 2
19661973
interruptible: false
19671974
variables:
@@ -1987,7 +1994,11 @@ basic ru dummy:
19871994
basic avx2 dpdk rtsan:
19881995
extends: .build_and_unit
19891996
rules:
1990-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
1997+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
1998+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
1999+
variables:
2000+
ENABLE_FFTW: "False"
2001+
ENABLE_MKL: "True"
19912002
retry: 2
19922003
interruptible: false
19932004
variables:
@@ -2016,8 +2027,15 @@ basic avx2 dpdk rtsan:
20162027
basic avx512 dpdk:
20172028
extends: .build_and_unit
20182029
rules:
2019-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
2030+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
2031+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
2032+
variables:
2033+
ENABLE_FFTW: "False"
2034+
ENABLE_MKL: "True"
20202035
- if: $CI_DESCRIPTION =~ /Weekly/
2036+
variables:
2037+
ENABLE_FFTW: "False"
2038+
ENABLE_MKL: "True"
20212039
retry: 2
20222040
interruptible: false
20232041
variables:
@@ -2044,15 +2062,26 @@ basic avx512 dpdk:
20442062
basic avx512 dpdk withassert:
20452063
extends: basic avx512 dpdk
20462064
rules:
2047-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
2065+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
2066+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
2067+
variables:
2068+
ENABLE_FFTW: "False"
2069+
ENABLE_MKL: "True"
20482070
variables:
20492071
ASSERT_LEVEL: PARANOID
20502072

20512073
basic avx512 dpdk rtsan:
20522074
extends: basic avx512 dpdk
20532075
rules:
2054-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
2076+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/
2077+
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
2078+
variables:
2079+
ENABLE_FFTW: "False"
2080+
ENABLE_MKL: "True"
20552081
- if: $CI_DESCRIPTION =~ /Weekly/
2082+
variables:
2083+
ENABLE_FFTW: "False"
2084+
ENABLE_MKL: "True"
20562085
variables:
20572086
OS: ubuntu-24.04-rtsan
20582087
COMPILER: clang

‎.gitlab/ci/builders.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
include:
1010
- project: softwareradiosystems/ci/tools
11-
ref: "21"
11+
ref: "22"
1212
file: .gitlab/ci-shared/setup/all.yml
1313
- project: softwareradiosystems/ci/tools
14-
ref: "21"
14+
ref: "22"
1515
file: .gitlab/ci-shared/tools/docker.yml
1616
- project: softwareradiosystems/ci/tools
17-
ref: "21"
17+
ref: "22"
1818
file: .gitlab/ci-shared/tools/python.yml
1919
- local: .gitlab/ci/builders/version.yml
2020

@@ -301,6 +301,7 @@ ubuntu-dpdk-builder arm64:
301301
mkdir -p ${CI_PROJECT_DIR}/${CONTEXT}/lib
302302
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends curl apt-transport-https ca-certificates xz-utils
303303
curl --header "PRIVATE-TOKEN: $CODEBOT_TOKEN" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/wls/25.03/libwls.so" -o ${CI_PROJECT_DIR}/${CONTEXT}/lib/libwls.so
304+
curl --header "PRIVATE-TOKEN: $CODEBOT_TOKEN" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libshared/0.0.1/libshared.so" -o ${CI_PROJECT_DIR}/${CONTEXT}/lib/libshared.so
304305
- cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
305306
- mkdir -p $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk
306307
- ls -lah $CONTEXT $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk

‎.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-20250615.0.365905
9+
ARG VERSION=base-20250706.0.377547
1010
FROM archlinux:$VERSION
1111

1212
ADD install_dependencies.sh /usr/local/bin

0 commit comments

Comments
 (0)