Skip to content

Commit 7732c93

Browse files
author
codebot
committed
Merge commit '75d1287958e94adeaf9654c280b91e1f4e9a76ad' into agpl_main
# Conflicts: # apps/gnb/CMakeLists.txt # include/srsran/phy/upper/resource_grid_mapper.h # lib/mac/mac_ctrl/srs_sched_config_adapter.h # lib/mac/rach_handler.h # tests/unittests/ofh/compression/CMakeLists.txt # tests/unittests/phy/upper/channel_processors/pdsch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pusch_demodulator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/nzp_csi_rs_generator_test_data.tar.gz
2 parents 56a771d + 75d1287 commit 7732c93

File tree

569 files changed

+15148
-5418
lines changed

Some content is hidden

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

569 files changed

+15148
-5418
lines changed

.gitlab-ci.yml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "6"
28+
ref: "8"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "6"
31+
ref: "8"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "6"
34+
ref: "8"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "6"
37+
ref: "8"
3838
file: .gitlab/ci-shared/tools/test_reporter.yml
3939
- local: .gitlab/ci/build.yml
4040
- local: .gitlab/ci/trx.yml
@@ -55,6 +55,15 @@ variables:
5555
SLACK_CHANNEL_FAIL: "#ci_gnb"
5656
SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
5757

58+
################################################################################
59+
## CI
60+
################################################################################
61+
autorebaser full:
62+
extends: .autorebaser
63+
rules:
64+
- if: $ON_DEFAULT_BRANCH
65+
when: never
66+
5867
################################################################################
5968
## Static
6069
################################################################################
@@ -79,17 +88,12 @@ full-code-format:
7988
image: ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/codechecker-gnb:1.0.3
8089
stage: static
8190
needs: []
82-
tags:
83-
- ${INFRASTRUCTURE_TAG}
8491
variables:
8592
ANALYZER: ""
8693
ANALYZER_ARGS: ""
8794
ARTIFACT_EXTRA_PATH: ""
88-
rules:
89-
- if: $ON_MR
90-
variables:
91-
ARTIFACT_EXTRA_PATH: "/index.html"
92-
- if: $CI_DESCRIPTION =~ /Nightly/
95+
KUBERNETES_MEMORY_REQUEST: 6Gi
96+
KUBERNETES_CPU_REQUEST: 4
9397
before_script:
9498
- |
9599
echo "
@@ -125,10 +129,15 @@ full-code-format:
125129

126130
clang-tidy:
127131
extends: .codechecker
128-
resource_group: ${CI_JOB_NAME_SLUG}_${GITLAB_USER_LOGIN}
132+
rules:
133+
- if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
134+
- if: $ON_MR
135+
when: manual
136+
allow_failure: false
129137
variables:
130138
ANALYZER: clang-tidy
131139
ANALYZER_ARGS: --tidy-config .clang-tidy
140+
ARTIFACT_EXTRA_PATH: "/index.html"
132141

133142
cppcheck:
134143
extends: .codechecker
@@ -145,7 +154,8 @@ clangsa:
145154
- if: $CI_DESCRIPTION =~ /Nightly/
146155
when: manual
147156
allow_failure: true
148-
interruptible: false
157+
- if: $CI_DESCRIPTION =~ /Weekly/
158+
interruptible: false
149159
variables:
150160
ANALYZER: clangsa
151161
ANALYZER_ARGS: --ctu
@@ -323,8 +333,6 @@ pages:
323333
needs:
324334
- job: unit coverage
325335
artifacts: true
326-
- job: clang-tidy
327-
artifacts: true
328336
- job: cppcheck
329337
artifacts: true
330338
- job: zmq

0 commit comments

Comments
 (0)