Skip to content

Commit 50fe962

Browse files
author
codebot
committed
Update main
# Conflicts: # include/srsran/cu_cp/cell_meas_manager.h # lib/cu_cp/cell_meas_manager/cell_meas_manager_factory.cpp # lib/cu_cp/mobility_manager/mobility_manager.h # lib/cu_cp/mobility_manager/mobility_manager_factory.cpp # lib/cu_cp/task_schedulers/ue_task_scheduler.cpp # lib/cu_cp/task_schedulers/ue_task_scheduler.h
2 parents a09b000 + 8cce136 commit 50fe962

File tree

166 files changed

+3052
-1836
lines changed

Some content is hidden

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

166 files changed

+3052
-1836
lines changed

.gitlab-ci.yml

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,17 @@
2525

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "15"
28+
ref: "16"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "15"
31+
ref: "16"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "15"
34+
ref: "16"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "15"
37+
ref: "16"
3838
file: .gitlab/ci-shared/tools/test_reporter.yml
39-
- project: softwareradiosystems/ci/tools
40-
ref: "15"
41-
file: .gitlab/ci-shared/tools/tagger.yml
4239
- local: .gitlab/ci/builders/version.yml
4340
- local: .gitlab/ci/build.yml
4441
- local: .gitlab/ci/trx.yml
@@ -65,6 +62,18 @@ variables:
6562
################################################################################
6663
## CI
6764
################################################################################
65+
job cleaner:
66+
extends: .job cleaner
67+
rules:
68+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
69+
70+
pr reminder:
71+
extends: .pr reminder
72+
rules:
73+
- if: $NOTIFY_SLACK != "true"
74+
when: never
75+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
76+
6877
trigger builder:
6978
stage: ci
7079
rules:
@@ -128,7 +137,7 @@ full-code-format:
128137
- if: $ON_MR
129138
changes:
130139
- .clang-format
131-
- if: $CI_DESCRIPTION =~ /Nightly/
140+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
132141

133142
.codechecker:
134143
image: ${CR_REGISTRY_URI}/srsgnb/codechecker:${DOCKER_BUILDER_VERSION}
@@ -199,7 +208,7 @@ clang-tidy:
199208
cppcheck:
200209
extends: .codechecker
201210
rules:
202-
- if: $CI_DESCRIPTION =~ /Nightly/
211+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
203212
interruptible: false
204213
variables:
205214
ANALYZER: cppcheck
@@ -211,7 +220,7 @@ cppcheck:
211220
clangsa:
212221
extends: .codechecker
213222
rules:
214-
- if: $CI_DESCRIPTION =~ /Nightly/
223+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
215224
when: manual
216225
allow_failure: true
217226
- if: $CI_DESCRIPTION =~ /Weekly/
@@ -354,7 +363,7 @@ unit coverage:
354363
unit coverage dev:
355364
extends: unit coverage
356365
rules:
357-
- if: $CI_DESCRIPTION =~ /Nightly/
366+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
358367
variables:
359368
coverage_report: full
360369
when: always # Even if previous stages/required jobs fail
@@ -365,7 +374,7 @@ unit coverage dev:
365374
pages:
366375
stage: documentation
367376
rules:
368-
- if: $CI_DESCRIPTION == "Nightly"
377+
- if: $CI_DESCRIPTION =~ /ightly Build + Unit Tests/
369378
when: always # Even if previous stages/required jobs fail
370379
allow_failure: true
371380
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7
@@ -404,55 +413,18 @@ pages:
404413
expire_in: 10 minutes
405414

406415
################################################################################
407-
# Git workflow graduation
416+
# Release dryrun
408417
################################################################################
409-
promote code:
410-
stage: .post
411-
rules:
412-
- if: $GRADUATION_BRANCH
413-
interruptible: false
414-
variables:
415-
GIT_STRATEGY: none
416-
image: alpine:3.16.0 # sh entrypoint
417-
before_script:
418-
- apk add git git-lfs
419-
- git lfs install
420-
script:
421-
- git clone https://${CODEBOT_USERNAME}:${CODEBOT_TOKEN}@gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git /${CI_PROJECT_NAME}
422-
- cd /${CI_PROJECT_NAME}
423-
- git checkout -t origin/$GRADUATION_BRANCH
424-
- git rebase ${CI_COMMIT_SHA}
425-
- git push
426-
dependencies: []
427-
428418
update agpl main dryrun:
429419
extends: .update agpl main
430420
stage: .post
431421
rules:
432-
- if: $CI_DESCRIPTION =~ /Nightly/
422+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
433423
when: always
434-
allow_failure: true
435424
variables:
436425
MODE: "dryrun"
437426
needs: []
438427

439-
tag successful schedule:
440-
extends: .create-tag
441-
stage: .post
442-
rules:
443-
- if: $CI_DESCRIPTION =~ /Nightly/
444-
when: manual
445-
allow_failure: true
446-
- if: $CI_DESCRIPTION =~ /Weekly/
447-
when: manual
448-
allow_failure: true
449-
variables:
450-
GIT_STRATEGY: none
451-
interruptible: false
452-
script:
453-
- create_tag $(date +"%Y.%m.%d")
454-
dependencies: []
455-
456428
################################################################################
457429
# Enable / Disable pipelines
458430
################################################################################
@@ -480,17 +452,3 @@ disable current schedule:
480452
BRANCH: $CI_COMMIT_REF_NAME
481453
DESCRIPTION: $CI_DESCRIPTION
482454
dependencies: []
483-
484-
enable schedule on graduation branch:
485-
stage: .post
486-
extends: .enable-schedule-by-branch
487-
rules:
488-
- if: $GRADUATION_BRANCH
489-
interruptible: false
490-
variables:
491-
ENABLE: "true"
492-
BRANCH: $GRADUATION_BRANCH
493-
needs:
494-
- job: promote code
495-
artifacts: false
496-
dependencies: []

0 commit comments

Comments
 (0)