Skip to content

Commit 480a720

Browse files
author
codebot
committed
Update main
# Conflicts: # include/srsran/rlc/rlc_config_messages.h # lib/support/config_json.cpp # tests/unittests/phy/upper/channel_processors/CMakeLists.txt # tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_processor_format1_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/uci/uci_decoder_test_data.tar.gz
2 parents 0c54975 + 6e416c4 commit 480a720

File tree

233 files changed

+3695
-26753
lines changed

Some content is hidden

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

233 files changed

+3695
-26753
lines changed

.gitlab-ci.yml

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

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "13"
28+
ref: "14"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "13"
31+
ref: "14"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "13"
34+
ref: "14"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "13"
37+
ref: "14"
3838
file: .gitlab/ci-shared/tools/test_reporter.yml
3939
- project: softwareradiosystems/ci/tools
40-
ref: "13"
40+
ref: "14"
4141
file: .gitlab/ci-shared/tools/tagger.yml
4242
- local: .gitlab/ci/builders/version.yml
4343
- local: .gitlab/ci/build.yml
@@ -71,13 +71,25 @@ trigger builder:
7171
- if: $ON_MR
7272
changes:
7373
paths:
74-
# - .gitlab/ci/src_cache.yml
75-
# - .gitlab/ci/builders.yml
74+
- .gitlab/ci/src_cache.yml
75+
- .gitlab/ci/builders.yml
7676
- .gitlab/ci/builders/**/*
7777
trigger:
7878
include: .gitlab/ci/builders.yml
7979
strategy: depend
8080

81+
trigger docker:
82+
stage: ci
83+
rules:
84+
- if: $ON_MR
85+
changes:
86+
paths:
87+
- .gitlab/ci/docker.yml
88+
- docker/**/*
89+
trigger:
90+
include: .gitlab/ci/docker.yml
91+
strategy: depend
92+
8193
################################################################################
8294
## Static
8395
################################################################################
@@ -241,34 +253,6 @@ e2e tests tox:
241253

242254
# In build.yml
243255

244-
srsran docker compose:
245-
stage: build and unit tests
246-
image: docker:24.0.1
247-
tags:
248-
- docker
249-
rules:
250-
- if: $ON_MR
251-
changes:
252-
paths:
253-
- docker/**/*
254-
- .gitlab/ci/builders/install_dependencies.sh
255-
- .gitlab/ci/builders/builder.sh
256-
- if: $CI_DESCRIPTION =~ /Weekly/
257-
timeout: 2h
258-
variables:
259-
DOCKER_HOST: tcp://docker:2375/
260-
DOCKER_DRIVER: overlay2
261-
DOCKER_TLS_CERTDIR: ""
262-
services:
263-
- name: docker:24.0.1-dind
264-
alias: docker
265-
entrypoint: ["env", "-u", "DOCKER_HOST"]
266-
command: ["dockerd-entrypoint.sh"]
267-
script:
268-
- docker compose -f docker/docker-compose.yml run --no-deps gnb gnb --version
269-
- docker compose -f docker/docker-compose.yml run 5gc 5gc -v
270-
needs: []
271-
272256
################################################################################
273257
# Doc generation
274258
################################################################################

0 commit comments

Comments
 (0)