Skip to content

Commit 342df75

Browse files
author
codebot
committed
Update main
2 parents bcf941b + 4db69e1 commit 342df75

File tree

268 files changed

+4770
-1649
lines changed

Some content is hidden

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

268 files changed

+4770
-1649
lines changed

‎.gitlab/ci/build.yml‎

Lines changed: 81 additions & 79 deletions
Large diffs are not rendered by default.

‎.gitlab/ci/builders.yml‎

Lines changed: 51 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ ubuntu-uhd-builder:
129129
- os_version: "22.04"
130130
arch_name: [amd64, arm64]
131131
uhd_version: ["4.6.0.0", "4.4.0.0", "4.3.0.0"] # "4.1.0.5" default
132-
- os_version: "23.04"
133-
arch_name: [amd64, arm64]
134-
uhd_version: ["4.6.0.0", "4.4.0.0"] # "4.3.0.0" default
135132
- os_version: "23.10"
136133
arch_name: [amd64, arm64]
137134
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
135+
# - os_version: "24.04"
136+
# arch_name: [amd64, arm64]
137+
# uhd_version: [] # "4.6.0.0" default
138138

139139
################################################################################
140140
# DPDK builder
@@ -221,12 +221,12 @@ ubuntu-dpdk-builder:
221221
- os_version: "22.04"
222222
arch_name: [amd64, arm64]
223223
dpdk_version: ["21.08", "22.11.3", "23.11"]
224-
- os_version: "23.04"
225-
arch_name: [amd64, arm64]
226-
dpdk_version: ["21.08", "22.11.3", "23.11"]
227224
- os_version: "23.10"
228225
arch_name: [amd64, arm64]
229226
dpdk_version: ["22.11.3", "23.11"]
227+
- os_version: "24.04"
228+
arch_name: [amd64, arm64]
229+
dpdk_version: ["23.11"]
230230

231231
################################################################################
232232
# Common
@@ -324,6 +324,9 @@ alternative-tag [codechecker]:
324324
skopeo copy \
325325
docker://${CR_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION} \
326326
docker://${GITLAB_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION}
327+
needs:
328+
- builder version
329+
- image-build-publish [codechecker]
327330

328331
################################################################################
329332
# Ubuntu 20.04
@@ -498,172 +501,160 @@ manifest [ubuntu, 22.04]:
498501
- REGISTRY: ["${CR_REGISTRY_URI}", "${GITLAB_REGISTRY_URI}"]
499502

500503
################################################################################
501-
# Ubuntu 23.04
504+
# Ubuntu 23.10
502505
################################################################################
503-
image-build-publish [ubuntu, 23.04, amd64]:
506+
image-build-publish [ubuntu, 23.10, amd64]:
504507
extends:
505508
- .image-build-publish
506509
variables:
507510
OS_FAMILY: debian
508511
OS_NAME: ubuntu
509-
OS_VERSION: "23.04"
512+
OS_VERSION: "23.10"
510513
PLATFORM: amd64
511514
needs:
512515
- builder version
513516
- job: ubuntu-uhd-builder
514517
parallel:
515518
matrix:
516-
- os_version: "23.04"
519+
- os_version: "23.10"
517520
arch_name: amd64
518-
uhd_version: ["4.6.0.0", "4.4.0.0"]
521+
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
519522
- job: ubuntu-dpdk-builder
520523
parallel:
521524
matrix:
522-
- os_version: "23.04"
525+
- os_version: "23.10"
523526
arch_name: amd64
524-
dpdk_version: ["21.08", "22.11.3", "23.11"]
527+
dpdk_version: ["22.11.3", "23.11"]
525528

526-
alternative-tag [ubuntu, 23.04, amd64]:
529+
alternative-tag [ubuntu, 23.10, amd64]:
527530
extends:
528531
- .alternative-tag
529532
variables:
530533
OS_NAME: ubuntu
531-
OS_VERSION: "23.04"
534+
OS_VERSION: "23.10"
532535
VERSION: ${DOCKER_BUILDER_VERSION}-amd64
533536
needs:
534537
- builder version
535-
- image-build-publish [ubuntu, 23.04, amd64]
538+
- image-build-publish [ubuntu, 23.10, amd64]
536539

537-
image-build-publish [ubuntu, 23.04, arm64]:
540+
image-build-publish [ubuntu, 23.10, arm64]:
538541
extends:
539542
- .image-build-publish
540543
variables:
541544
OS_FAMILY: debian
542545
OS_NAME: ubuntu
543-
OS_VERSION: "23.04"
546+
OS_VERSION: "23.10"
544547
PLATFORM: arm64
545548
needs:
546549
- builder version
547550
- job: ubuntu-uhd-builder
548551
parallel:
549552
matrix:
550-
- os_version: "23.04"
553+
- os_version: "23.10"
551554
arch_name: arm64
552-
uhd_version: ["4.6.0.0", "4.4.0.0"]
555+
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
553556
- job: ubuntu-dpdk-builder
554557
parallel:
555558
matrix:
556-
- os_version: "23.04"
559+
- os_version: "23.10"
557560
arch_name: arm64
558-
dpdk_version: ["21.08", "22.11.3", "23.11"]
561+
dpdk_version: ["22.11.3", "23.11"]
559562

560-
alternative-tag [ubuntu, 23.04, arm64]:
563+
alternative-tag [ubuntu, 23.10, arm64]:
561564
extends:
562565
- .alternative-tag
563566
variables:
564567
OS_NAME: ubuntu
565-
OS_VERSION: "23.04"
568+
OS_VERSION: "23.10"
566569
VERSION: ${DOCKER_BUILDER_VERSION}-arm64
567570
needs:
568571
- builder version
569-
- image-build-publish [ubuntu, 23.04, arm64]
572+
- image-build-publish [ubuntu, 23.10, arm64]
570573

571-
manifest [ubuntu, 23.04]:
574+
manifest [ubuntu, 23.10]:
572575
extends: .manifest
573576
variables:
574577
OS_NAME: ubuntu
575-
OS_VERSION: "23.04"
578+
OS_VERSION: "23.10"
576579
needs:
577580
- builder version
578-
- job: alternative-tag [ubuntu, 23.04, amd64]
581+
- job: alternative-tag [ubuntu, 23.10, amd64]
579582
optional: false
580-
- job: alternative-tag [ubuntu, 23.04, arm64]
583+
- job: alternative-tag [ubuntu, 23.10, arm64]
581584
optional: false
582585
parallel:
583586
matrix:
584587
- REGISTRY: ["${CR_REGISTRY_URI}", "${GITLAB_REGISTRY_URI}"]
585588

586589
################################################################################
587-
# Ubuntu 23.10
590+
# Ubuntu 24.04
588591
################################################################################
589-
image-build-publish [ubuntu, 23.10, amd64]:
592+
image-build-publish [ubuntu, 24.04, amd64]:
590593
extends:
591594
- .image-build-publish
592595
variables:
593596
OS_FAMILY: debian
594597
OS_NAME: ubuntu
595-
OS_VERSION: "23.10"
598+
OS_VERSION: "24.04"
596599
PLATFORM: amd64
597600
needs:
598601
- builder version
599-
- job: ubuntu-uhd-builder
600-
parallel:
601-
matrix:
602-
- os_version: "23.10"
603-
arch_name: amd64
604-
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
605602
- job: ubuntu-dpdk-builder
606603
parallel:
607604
matrix:
608-
- os_version: "23.10"
605+
- os_version: "24.04"
609606
arch_name: amd64
610-
dpdk_version: ["22.11.3", "23.11"]
607+
dpdk_version: ["23.11"]
611608

612-
alternative-tag [ubuntu, 23.10, amd64]:
609+
alternative-tag [ubuntu, 24.04, amd64]:
613610
extends:
614611
- .alternative-tag
615612
variables:
616613
OS_NAME: ubuntu
617-
OS_VERSION: "23.10"
614+
OS_VERSION: "24.04"
618615
VERSION: ${DOCKER_BUILDER_VERSION}-amd64
619616
needs:
620617
- builder version
621-
- image-build-publish [ubuntu, 23.10, amd64]
618+
- image-build-publish [ubuntu, 24.04, amd64]
622619

623-
image-build-publish [ubuntu, 23.10, arm64]:
620+
image-build-publish [ubuntu, 24.04, arm64]:
624621
extends:
625622
- .image-build-publish
626623
variables:
627624
OS_FAMILY: debian
628625
OS_NAME: ubuntu
629-
OS_VERSION: "23.10"
626+
OS_VERSION: "24.04"
630627
PLATFORM: arm64
631628
needs:
632629
- builder version
633-
- job: ubuntu-uhd-builder
634-
parallel:
635-
matrix:
636-
- os_version: "23.10"
637-
arch_name: arm64
638-
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
639630
- job: ubuntu-dpdk-builder
640631
parallel:
641632
matrix:
642-
- os_version: "23.10"
633+
- os_version: "24.04"
643634
arch_name: arm64
644-
dpdk_version: ["22.11.3", "23.11"]
635+
dpdk_version: ["23.11"]
645636

646-
alternative-tag [ubuntu, 23.10, arm64]:
637+
alternative-tag [ubuntu, 24.04, arm64]:
647638
extends:
648639
- .alternative-tag
649640
variables:
650641
OS_NAME: ubuntu
651-
OS_VERSION: "23.10"
642+
OS_VERSION: "24.04"
652643
VERSION: ${DOCKER_BUILDER_VERSION}-arm64
653644
needs:
654645
- builder version
655-
- image-build-publish [ubuntu, 23.10, arm64]
646+
- image-build-publish [ubuntu, 24.04, arm64]
656647

657-
manifest [ubuntu, 23.10]:
648+
manifest [ubuntu, 24.04]:
658649
extends: .manifest
659650
variables:
660651
OS_NAME: ubuntu
661-
OS_VERSION: "23.10"
652+
OS_VERSION: "24.04"
662653
needs:
663654
- builder version
664-
- job: alternative-tag [ubuntu, 23.10, amd64]
655+
- job: alternative-tag [ubuntu, 24.04, amd64]
665656
optional: false
666-
- job: alternative-tag [ubuntu, 23.10, arm64]
657+
- job: alternative-tag [ubuntu, 24.04, arm64]
667658
optional: false
668659
parallel:
669660
matrix:

‎.gitlab/ci/e2e.yml‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,20 @@ amari 32UE:
266266
- *retina-needs
267267
parallel:
268268
matrix:
269-
- KEYWORDS: ["attach_detach", "reestablishment", "ping", "iperf and udp", "iperf and tcp"]
269+
- KEYWORDS: ["attach_detach", "ping", "iperf and udp", "iperf and tcp"]
270+
271+
amari 32UE [reestablishment]:
272+
extends: .zmq
273+
variables:
274+
MARKERS: "zmq and not smoke"
275+
E2E_LOG_LEVEL: "info"
276+
KEYWORDS: reestablishment
277+
allow_failure: true
278+
needs:
279+
- job: "basic relwithdeb"
280+
artifacts: true
281+
- *txrx-lib
282+
- *retina-needs
270283

271284
amari 32UE asan:
272285
extends: .zmq
@@ -310,7 +323,6 @@ test mode ue:
310323
stage: zmq
311324
extends: .e2e-run
312325
variables:
313-
GROUP: "test_mode"
314326
TESTBED: "test_mode"
315327
MARKERS: "test_mode"
316328
KEYWORDS: "test_ue"
@@ -323,6 +335,8 @@ test mode ue:
323335

324336
test mode ue tsan:
325337
extends: test mode ue
338+
when: manual
339+
allow_failure: true
326340
needs:
327341
- job: "basic tsan"
328342
artifacts: true
@@ -348,14 +362,16 @@ test mode ue memcheck:
348362
test mode ru:
349363
stage: zmq
350364
extends: .e2e-run
365+
when: manual
366+
allow_failure: true
351367
variables:
352-
GROUP: "test_mode"
353-
TESTBED: "test_mode"
368+
GROUP: "viavi"
369+
TESTBED: "viavi"
354370
MARKERS: "test_mode"
355371
KEYWORDS: "test_ru"
356372
E2E_LOG_LEVEL: "info"
357373
needs:
358-
- job: "basic relwithdeb"
374+
- job: "basic avx512 dpdk"
359375
artifacts: true
360376
- *txrx-lib
361377
- *retina-needs
@@ -364,6 +380,7 @@ test mode ru tsan:
364380
extends: test mode ru
365381
variables:
366382
E2E_LOG_LEVEL: "warning"
383+
when: manual
367384
allow_failure: true
368385
needs:
369386
- job: "basic tsan"
@@ -375,6 +392,7 @@ test mode ru asan:
375392
extends: test mode ru
376393
variables:
377394
E2E_LOG_LEVEL: "warning"
395+
when: manual
378396
allow_failure: true
379397
needs:
380398
- job: "basic asan"
@@ -386,6 +404,7 @@ test mode ru memcheck:
386404
extends: test mode ru
387405
variables:
388406
E2E_LOG_LEVEL: "warning"
407+
when: manual
389408
allow_failure: true
390409
needs:
391410
- job: "basic memcheck"
@@ -412,6 +431,8 @@ test mode ru memcheck:
412431

413432
amari b200 asan:
414433
extends: .rf
434+
when: manual
435+
allow_failure: true
415436
variables:
416437
MARKERS: "rf_not_crash"
417438
needs:
@@ -421,11 +442,15 @@ amari b200 asan:
421442

422443
validate b200 config:
423444
extends: .rf
445+
when: manual
446+
allow_failure: true
424447
variables:
425448
MARKERS: "rf_b200"
426449

427450
validate n300 config:
428451
extends: .rf
452+
when: manual
453+
allow_failure: true
429454
variables:
430455
MARKERS: "rf_n300"
431456
TESTBED: "android_n300"
@@ -451,10 +476,8 @@ android b200:
451476
android x300:
452477
stage: rf
453478
extends: .e2e-run
454-
rules:
455-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
456-
when: manual
457-
allow_failure: true
479+
when: manual
480+
allow_failure: true
458481
variables:
459482
GROUP: "rf"
460483
TESTBED: "android_x300"
@@ -478,10 +501,8 @@ android n300:
478501
viavi:
479502
stage: rf
480503
extends: .e2e-run
481-
rules:
482-
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
483-
when: manual
484-
allow_failure: true
504+
when: manual
505+
allow_failure: true
485506
variables:
486507
GROUP: "viavi"
487508
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.42.3
3+
RETINA_VERSION=0.43.0
44
AMARISOFT_VERSION=2023-03-17
55
SRSUE_VERSION=23.11
66
OPEN5GS_VERSION=2.6.1

0 commit comments

Comments
 (0)