Skip to content

Commit fc4e810

Browse files
author
codebot
committed
Update main
# Conflicts: # apps/services/core_isolation_manager.h # lib/cu_cp/task_schedulers/cu_up_task_scheduler.cpp # lib/cu_cp/task_schedulers/cu_up_task_scheduler.h # lib/mac/mac_ctrl/du_time_controller.cpp # lib/mac/mac_ctrl/du_time_controller.h # lib/pdcp/pdcp_tx_buf_info.h # lib/phy/upper/channel_processors/pdsch/pdsch_processor_asynchronous_pool.h # lib/scheduler/pucch_scheduling/pucch_guardbands_scheduler.cpp # lib/scheduler/pucch_scheduling/pucch_guardbands_scheduler.h # tests/unittests/mac/du_timer_controller_test.cpp # tests/unittests/scheduler/uci_and_pucch/pucch_guardbands_sched_test.cpp
2 parents d90cd4e + 8a31442 commit fc4e810

File tree

1,238 files changed

+22311
-13563
lines changed

Some content is hidden

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

1,238 files changed

+22311
-13563
lines changed

.github/workflows/docker.yml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111
docker:
1212
if: ${{ vars.SKIP_DOCKER_JOB != 'true' }}
1313
runs-on: ubuntu-latest
14+
permissions:
15+
id-token: write
1416
strategy:
1517
matrix:
1618
include:
@@ -24,6 +26,7 @@ jobs:
2426
DPDK_VERSION: ""
2527
DOCKERFILE: ./docker/telegraf/Dockerfile
2628
CONTEXT: ./docker/telegraf
29+
ATTESTATION_FILE: ""
2730
# --> grafana
2831
- TAGNAME: ""
2932
REPOSITORY: grafana
@@ -34,43 +37,48 @@ jobs:
3437
DPDK_VERSION: ""
3538
DOCKERFILE: ./docker/grafana/Dockerfile
3639
CONTEXT: ./docker/grafana
40+
ATTESTATION_FILE: ""
3741
# --> gnb
3842
# AMD AVX2
3943
- TAGNAME: release_avx2
4044
REPOSITORY: srsran-project
4145
MARCH: x86-64-v3
4246
PLATFORM: amd64
4347
UHD_VERSION: "4.7.0.0"
44-
DPDK_VERSION: "23.11.1"
48+
DPDK_VERSION: "24.11.2"
4549
DOCKERFILE: ./docker/Dockerfile
4650
CONTEXT: ./
51+
ATTESTATION_FILE: /usr/local/etc/srsran_image.spdx
4752
- TAGNAME: release_with_debug_avx2
4853
REPOSITORY: srsran-project
4954
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
5055
MARCH: x86-64-v3
5156
PLATFORM: amd64
5257
UHD_VERSION: "4.7.0.0"
53-
DPDK_VERSION: "23.11.1"
58+
DPDK_VERSION: "24.11.2"
5459
DOCKERFILE: ./docker/Dockerfile
5560
CONTEXT: ./
61+
ATTESTATION_FILE: /usr/local/etc/srsran_image.spdx
5662
# AMD AVX512
5763
- TAGNAME: release_avx512
5864
REPOSITORY: srsran-project
5965
MARCH: x86-64-v4
6066
PLATFORM: amd64
6167
UHD_VERSION: "4.7.0.0"
62-
DPDK_VERSION: "23.11.1"
68+
DPDK_VERSION: "24.11.2"
6369
DOCKERFILE: ./docker/Dockerfile
6470
CONTEXT: ./
71+
ATTESTATION_FILE: /usr/local/etc/srsran_image.spdx
6572
- TAGNAME: release_with_debug_avx512
6673
REPOSITORY: srsran-project
6774
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
6875
MARCH: x86-64-v4
6976
PLATFORM: amd64
7077
UHD_VERSION: "4.7.0.0"
71-
DPDK_VERSION: "23.11.1"
78+
DPDK_VERSION: "24.11.2"
7279
DOCKERFILE: ./docker/Dockerfile
7380
CONTEXT: ./
81+
ATTESTATION_FILE: /usr/local/etc/srsran_image.spdx
7482
env:
7583
PREFIX: softwareradiosystems/${{ matrix.REPOSITORY }}:${{ matrix.TAGNAME }}
7684
environment: dockerhub
@@ -84,6 +92,18 @@ jobs:
8492
- name: Set up Docker Buildx
8593
uses: docker/setup-buildx-action@v3
8694

95+
- name: Set up cosign
96+
uses: sigstore/cosign-installer@v3
97+
98+
- name: Install regctl
99+
uses: actions/setup-go@v3
100+
with:
101+
go-version: '1.x'
102+
- name: Set up regctl
103+
run: |
104+
go install github.com/regclient/regclient/cmd/regctl@latest
105+
shell: bash
106+
87107
- name: Determine tags based on branch
88108
id: tags
89109
run: |
@@ -114,6 +134,7 @@ jobs:
114134
ecr: false
115135

116136
- name: Build and push
137+
id: build_and_push
117138
uses: docker/build-push-action@v6
118139
with:
119140
push: true
@@ -126,3 +147,19 @@ jobs:
126147
UHD_VERSION=${{ matrix.UHD_VERSION }}
127148
DPDK_VERSION=${{ matrix.DPDK_VERSION }}
128149
MARCH=${{ matrix.MARCH }}
150+
151+
- name: Attest image
152+
if: ${{ matrix.ATTESTATION_FILE != '' }}
153+
run: |
154+
IFS=',' read -ra TAG_LIST <<< "${{ steps.tags.outputs.tags }}"
155+
DIGEST=${{ steps.build_and_push.outputs.digest }}
156+
157+
for IMAGE_TAG in "${TAG_LIST[@]}"; do
158+
IMAGE_DIGEST="$IMAGE_TAG@$DIGEST"
159+
regctl image get-file "$IMAGE_TAG" ${{ matrix.ATTESTATION_FILE }} > image.spdx
160+
cosign attest --predicate image.spdx --type spdx "$IMAGE_DIGEST"
161+
done
162+
shell: bash
163+
env:
164+
COSIGN_EXPERIMENTAL: 1
165+
COSIGN_YES: 1

.gitlab-ci.yml

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

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "22"
28+
ref: "23"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "22"
31+
ref: "23"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "22"
34+
ref: "23"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "22"
37+
ref: "23"
3838
file: .gitlab/ci-shared/tools/tagger.yml
3939
- local: .gitlab/ci/builders/version.yml
4040
- local: .gitlab/ci/build.yml
@@ -222,6 +222,28 @@ pr reminder:
222222
when: never
223223
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
224224

225+
handle stale issues:
226+
extends: .handle_stale_issues
227+
rules:
228+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
229+
variables:
230+
WARN_LABEL: "not seen in a while"
231+
CLOSE_MESSAGE: "Issue closed due to inactivity. Please reopen it if it happens again."
232+
parallel:
233+
matrix:
234+
- LABELS_INCLUDE: "bug::ci"
235+
LABELS_EXCLUDE: "low_priority,mid_priority"
236+
WARN_THRESHOLD: 10
237+
CLOSE_THRESHOLD: 30
238+
- LABELS_INCLUDE: "bug::ci,mid_priority"
239+
LABELS_EXCLUDE: "low_priority"
240+
WARN_THRESHOLD: 20
241+
CLOSE_THRESHOLD: 60
242+
- LABELS_INCLUDE: "bug::ci,low_priority"
243+
LABELS_EXCLUDE: ""
244+
WARN_THRESHOLD: 30
245+
CLOSE_THRESHOLD: 90
246+
225247
matlab nightly:
226248
stage: ci
227249
rules:

.gitlab/ci-shared/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ variables:
8787
before_script:
8888
- |
8989
for var in \
90-
CMAKE_BUILD_TYPE ASSERT_LEVEL ENABLE_EXPORT ENABLE_BACKWARD \
90+
CMAKE_BUILD_TYPE LINKER \
91+
ASSERT_LEVEL ENABLE_EXPORT ENABLE_BACKWARD \
9192
ENABLE_FFTW ENABLE_MKL ENABLE_ARMPL \
9293
ENABLE_UHD ENABLE_DPDK ENABLE_ZEROMQ \
9394
ENABLE_ASAN ENABLE_TSAN ENABLE_GCOV \

.gitlab/ci-shared/e2e.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ variables:
77
- "zmq_deb"
88
- "zmq_srsue"
99
- "zmq_cudu"
10+
- "zmq_cu2du"
1011
- "rf_b200"
1112
- "rf_hp"
1213
- "android_b200"
@@ -110,7 +111,7 @@ variables:
110111
done < <(git lfs ls-files | sed -r 's/^.{13}//')
111112
echo "srsGNB sources+build size is" $(du -hs .)
112113
# Remove any existing retina resource for this group
113-
- retina-delete-orchestration-network --user-name ci_${GROUP}
114+
- retina release --username ci_${GROUP}
114115
# Add extra config env variables to the .env file
115116
- |
116117
echo "" >> .gitlab/ci/e2e/.env
@@ -134,7 +135,7 @@ variables:
134135
after_script:
135136
# Remove any existing retina resource for this group
136137
- *setup_kube_config
137-
- retina-delete-orchestration-network --user-name ci_${GROUP}
138+
- retina release --username ci_${GROUP}
138139
# Push test metrics
139140
- |
140141
find . -iname "test_metrics.csv" -exec sh -c \

.gitlab/ci-shared/template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
include:
22
- project: softwareradiosystems/ci/tools
3-
ref: "22"
3+
ref: "23"
44
file: .gitlab/ci-shared/setup/all.yml
55
- project: softwareradiosystems/ci/tools
6-
ref: "22"
6+
ref: "23"
77
file: .gitlab/ci-shared/features/all.yml
88
- local: .gitlab/ci-shared/e2e.yml
99
- local: .gitlab/ci-shared/build.yml

0 commit comments

Comments
 (0)