Skip to content

Commit

Permalink
Update main
Browse files Browse the repository at this point in the history
  • Loading branch information
codebot committed Feb 22, 2024
2 parents bcf941b + 4db69e1 commit 342df75
Show file tree
Hide file tree
Showing 268 changed files with 4,770 additions and 1,649 deletions.
160 changes: 81 additions & 79 deletions .gitlab/ci/build.yml
View file

Large diffs are not rendered by default.

111 changes: 51 additions & 60 deletions .gitlab/ci/builders.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ ubuntu-uhd-builder:
- os_version: "22.04"
arch_name: [amd64, arm64]
uhd_version: ["4.6.0.0", "4.4.0.0", "4.3.0.0"] # "4.1.0.5" default
- os_version: "23.04"
arch_name: [amd64, arm64]
uhd_version: ["4.6.0.0", "4.4.0.0"] # "4.3.0.0" default
- os_version: "23.10"
arch_name: [amd64, arm64]
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
# - os_version: "24.04"
# arch_name: [amd64, arm64]
# uhd_version: [] # "4.6.0.0" default

################################################################################
# DPDK builder
Expand Down Expand Up @@ -221,12 +221,12 @@ ubuntu-dpdk-builder:
- os_version: "22.04"
arch_name: [amd64, arm64]
dpdk_version: ["21.08", "22.11.3", "23.11"]
- os_version: "23.04"
arch_name: [amd64, arm64]
dpdk_version: ["21.08", "22.11.3", "23.11"]
- os_version: "23.10"
arch_name: [amd64, arm64]
dpdk_version: ["22.11.3", "23.11"]
- os_version: "24.04"
arch_name: [amd64, arm64]
dpdk_version: ["23.11"]

################################################################################
# Common
Expand Down Expand Up @@ -324,6 +324,9 @@ alternative-tag [codechecker]:
skopeo copy \
docker://${CR_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION} \
docker://${GITLAB_REGISTRY_URI}${CI_PROJECT_NAMESPACE#'softwareradiosystems'}/${CI_PROJECT_NAME}/codechecker:${DOCKER_BUILDER_VERSION}
needs:
- builder version
- image-build-publish [codechecker]

################################################################################
# Ubuntu 20.04
Expand Down Expand Up @@ -498,172 +501,160 @@ manifest [ubuntu, 22.04]:
- REGISTRY: ["${CR_REGISTRY_URI}", "${GITLAB_REGISTRY_URI}"]

################################################################################
# Ubuntu 23.04
# Ubuntu 23.10
################################################################################
image-build-publish [ubuntu, 23.04, amd64]:
image-build-publish [ubuntu, 23.10, amd64]:
extends:
- .image-build-publish
variables:
OS_FAMILY: debian
OS_NAME: ubuntu
OS_VERSION: "23.04"
OS_VERSION: "23.10"
PLATFORM: amd64
needs:
- builder version
- job: ubuntu-uhd-builder
parallel:
matrix:
- os_version: "23.04"
- os_version: "23.10"
arch_name: amd64
uhd_version: ["4.6.0.0", "4.4.0.0"]
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
- job: ubuntu-dpdk-builder
parallel:
matrix:
- os_version: "23.04"
- os_version: "23.10"
arch_name: amd64
dpdk_version: ["21.08", "22.11.3", "23.11"]
dpdk_version: ["22.11.3", "23.11"]

alternative-tag [ubuntu, 23.04, amd64]:
alternative-tag [ubuntu, 23.10, amd64]:
extends:
- .alternative-tag
variables:
OS_NAME: ubuntu
OS_VERSION: "23.04"
OS_VERSION: "23.10"
VERSION: ${DOCKER_BUILDER_VERSION}-amd64
needs:
- builder version
- image-build-publish [ubuntu, 23.04, amd64]
- image-build-publish [ubuntu, 23.10, amd64]

image-build-publish [ubuntu, 23.04, arm64]:
image-build-publish [ubuntu, 23.10, arm64]:
extends:
- .image-build-publish
variables:
OS_FAMILY: debian
OS_NAME: ubuntu
OS_VERSION: "23.04"
OS_VERSION: "23.10"
PLATFORM: arm64
needs:
- builder version
- job: ubuntu-uhd-builder
parallel:
matrix:
- os_version: "23.04"
- os_version: "23.10"
arch_name: arm64
uhd_version: ["4.6.0.0", "4.4.0.0"]
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
- job: ubuntu-dpdk-builder
parallel:
matrix:
- os_version: "23.04"
- os_version: "23.10"
arch_name: arm64
dpdk_version: ["21.08", "22.11.3", "23.11"]
dpdk_version: ["22.11.3", "23.11"]

alternative-tag [ubuntu, 23.04, arm64]:
alternative-tag [ubuntu, 23.10, arm64]:
extends:
- .alternative-tag
variables:
OS_NAME: ubuntu
OS_VERSION: "23.04"
OS_VERSION: "23.10"
VERSION: ${DOCKER_BUILDER_VERSION}-arm64
needs:
- builder version
- image-build-publish [ubuntu, 23.04, arm64]
- image-build-publish [ubuntu, 23.10, arm64]

manifest [ubuntu, 23.04]:
manifest [ubuntu, 23.10]:
extends: .manifest
variables:
OS_NAME: ubuntu
OS_VERSION: "23.04"
OS_VERSION: "23.10"
needs:
- builder version
- job: alternative-tag [ubuntu, 23.04, amd64]
- job: alternative-tag [ubuntu, 23.10, amd64]
optional: false
- job: alternative-tag [ubuntu, 23.04, arm64]
- job: alternative-tag [ubuntu, 23.10, arm64]
optional: false
parallel:
matrix:
- REGISTRY: ["${CR_REGISTRY_URI}", "${GITLAB_REGISTRY_URI}"]

################################################################################
# Ubuntu 23.10
# Ubuntu 24.04
################################################################################
image-build-publish [ubuntu, 23.10, amd64]:
image-build-publish [ubuntu, 24.04, amd64]:
extends:
- .image-build-publish
variables:
OS_FAMILY: debian
OS_NAME: ubuntu
OS_VERSION: "23.10"
OS_VERSION: "24.04"
PLATFORM: amd64
needs:
- builder version
- job: ubuntu-uhd-builder
parallel:
matrix:
- os_version: "23.10"
arch_name: amd64
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
- job: ubuntu-dpdk-builder
parallel:
matrix:
- os_version: "23.10"
- os_version: "24.04"
arch_name: amd64
dpdk_version: ["22.11.3", "23.11"]
dpdk_version: ["23.11"]

alternative-tag [ubuntu, 23.10, amd64]:
alternative-tag [ubuntu, 24.04, amd64]:
extends:
- .alternative-tag
variables:
OS_NAME: ubuntu
OS_VERSION: "23.10"
OS_VERSION: "24.04"
VERSION: ${DOCKER_BUILDER_VERSION}-amd64
needs:
- builder version
- image-build-publish [ubuntu, 23.10, amd64]
- image-build-publish [ubuntu, 24.04, amd64]

image-build-publish [ubuntu, 23.10, arm64]:
image-build-publish [ubuntu, 24.04, arm64]:
extends:
- .image-build-publish
variables:
OS_FAMILY: debian
OS_NAME: ubuntu
OS_VERSION: "23.10"
OS_VERSION: "24.04"
PLATFORM: arm64
needs:
- builder version
- job: ubuntu-uhd-builder
parallel:
matrix:
- os_version: "23.10"
arch_name: arm64
uhd_version: ["4.6.0.0"] # "4.4.0.0" default
- job: ubuntu-dpdk-builder
parallel:
matrix:
- os_version: "23.10"
- os_version: "24.04"
arch_name: arm64
dpdk_version: ["22.11.3", "23.11"]
dpdk_version: ["23.11"]

alternative-tag [ubuntu, 23.10, arm64]:
alternative-tag [ubuntu, 24.04, arm64]:
extends:
- .alternative-tag
variables:
OS_NAME: ubuntu
OS_VERSION: "23.10"
OS_VERSION: "24.04"
VERSION: ${DOCKER_BUILDER_VERSION}-arm64
needs:
- builder version
- image-build-publish [ubuntu, 23.10, arm64]
- image-build-publish [ubuntu, 24.04, arm64]

manifest [ubuntu, 23.10]:
manifest [ubuntu, 24.04]:
extends: .manifest
variables:
OS_NAME: ubuntu
OS_VERSION: "23.10"
OS_VERSION: "24.04"
needs:
- builder version
- job: alternative-tag [ubuntu, 23.10, amd64]
- job: alternative-tag [ubuntu, 24.04, amd64]
optional: false
- job: alternative-tag [ubuntu, 23.10, arm64]
- job: alternative-tag [ubuntu, 24.04, arm64]
optional: false
parallel:
matrix:
Expand Down
47 changes: 34 additions & 13 deletions .gitlab/ci/e2e.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,20 @@ amari 32UE:
- *retina-needs
parallel:
matrix:
- KEYWORDS: ["attach_detach", "reestablishment", "ping", "iperf and udp", "iperf and tcp"]
- KEYWORDS: ["attach_detach", "ping", "iperf and udp", "iperf and tcp"]

amari 32UE [reestablishment]:
extends: .zmq
variables:
MARKERS: "zmq and not smoke"
E2E_LOG_LEVEL: "info"
KEYWORDS: reestablishment
allow_failure: true
needs:
- job: "basic relwithdeb"
artifacts: true
- *txrx-lib
- *retina-needs

amari 32UE asan:
extends: .zmq
Expand Down Expand Up @@ -310,7 +323,6 @@ test mode ue:
stage: zmq
extends: .e2e-run
variables:
GROUP: "test_mode"
TESTBED: "test_mode"
MARKERS: "test_mode"
KEYWORDS: "test_ue"
Expand All @@ -323,6 +335,8 @@ test mode ue:

test mode ue tsan:
extends: test mode ue
when: manual
allow_failure: true
needs:
- job: "basic tsan"
artifacts: true
Expand All @@ -348,14 +362,16 @@ test mode ue memcheck:
test mode ru:
stage: zmq
extends: .e2e-run
when: manual
allow_failure: true
variables:
GROUP: "test_mode"
TESTBED: "test_mode"
GROUP: "viavi"
TESTBED: "viavi"
MARKERS: "test_mode"
KEYWORDS: "test_ru"
E2E_LOG_LEVEL: "info"
needs:
- job: "basic relwithdeb"
- job: "basic avx512 dpdk"
artifacts: true
- *txrx-lib
- *retina-needs
Expand All @@ -364,6 +380,7 @@ test mode ru tsan:
extends: test mode ru
variables:
E2E_LOG_LEVEL: "warning"
when: manual
allow_failure: true
needs:
- job: "basic tsan"
Expand All @@ -375,6 +392,7 @@ test mode ru asan:
extends: test mode ru
variables:
E2E_LOG_LEVEL: "warning"
when: manual
allow_failure: true
needs:
- job: "basic asan"
Expand All @@ -386,6 +404,7 @@ test mode ru memcheck:
extends: test mode ru
variables:
E2E_LOG_LEVEL: "warning"
when: manual
allow_failure: true
needs:
- job: "basic memcheck"
Expand All @@ -412,6 +431,8 @@ test mode ru memcheck:

amari b200 asan:
extends: .rf
when: manual
allow_failure: true
variables:
MARKERS: "rf_not_crash"
needs:
Expand All @@ -421,11 +442,15 @@ amari b200 asan:

validate b200 config:
extends: .rf
when: manual
allow_failure: true
variables:
MARKERS: "rf_b200"

validate n300 config:
extends: .rf
when: manual
allow_failure: true
variables:
MARKERS: "rf_n300"
TESTBED: "android_n300"
Expand All @@ -451,10 +476,8 @@ android b200:
android x300:
stage: rf
extends: .e2e-run
rules:
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
when: manual
allow_failure: true
when: manual
allow_failure: true
variables:
GROUP: "rf"
TESTBED: "android_x300"
Expand All @@ -478,10 +501,8 @@ android n300:
viavi:
stage: rf
extends: .e2e-run
rules:
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
when: manual
allow_failure: true
when: manual
allow_failure: true
variables:
GROUP: "viavi"
TESTBED: "viavi"
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/ci/e2e/.env
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
RETINA_VERSION=0.42.3
RETINA_VERSION=0.43.0
AMARISOFT_VERSION=2023-03-17
SRSUE_VERSION=23.11
OPEN5GS_VERSION=2.6.1
Expand Down
Loading

0 comments on commit 342df75

Please sign in to comment.