Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/ci: uprev mesa
LAVA was recently patched [1] with a fix on how parameters are parsed in
`lava-test-case`, so we don't need to repeat quotes to send the
arguments properly to it. Uprev mesa to fix this issue.
[1] https://gitlab.com/lava/lava/-/commit/18c9cf79
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Acked-by: Helen Koike <helen.fornazier@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Link: https://lore.kernel.org/r/20250314085858.39328-2-vignesh.raman@collabora.com
+77
-12
+8
-8
drivers/gpu/drm/ci/build.sh
+8
-8
drivers/gpu/drm/ci/build.sh
···
98
98
99
99
make ${KERNEL_IMAGE_NAME}
100
100
101
-
mkdir -p /lava-files/
101
+
mkdir -p /kernel/
102
102
for image in ${KERNEL_IMAGE_NAME}; do
103
-
cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
103
+
cp arch/${KERNEL_ARCH}/boot/${image} /kernel/.
104
104
done
105
105
106
106
if [[ -n ${DEVICE_TREES} ]]; then
107
107
make dtbs
108
-
cp ${DEVICE_TREES} /lava-files/.
108
+
cp ${DEVICE_TREES} /kernel/.
109
109
fi
110
110
111
111
make modules
···
121
121
-d arch/arm64/boot/Image.lzma \
122
122
-C lzma\
123
123
-b arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb \
124
-
/lava-files/cheza-kernel
124
+
/kernel/cheza-kernel
125
125
KERNEL_IMAGE_NAME+=" cheza-kernel"
126
126
127
127
# Make a gzipped copy of the Image for db410c.
128
-
gzip -k /lava-files/Image
128
+
gzip -k /kernel/Image
129
129
KERNEL_IMAGE_NAME+=" Image.gz"
130
130
fi
131
131
···
139
139
. .gitlab-ci/container/container_post_build.sh
140
140
141
141
if [[ "$UPLOAD_TO_MINIO" = "1" ]]; then
142
-
xz -7 -c -T${FDO_CI_CONCURRENT:-4} vmlinux > /lava-files/vmlinux.xz
142
+
xz -7 -c -T${FDO_CI_CONCURRENT:-4} vmlinux > /kernel/vmlinux.xz
143
143
FILES_TO_UPLOAD="$KERNEL_IMAGE_NAME vmlinux.xz"
144
144
145
145
if [[ -n $DEVICE_TREES ]]; then
···
148
148
149
149
ls -l "${S3_JWT_FILE}"
150
150
for f in $FILES_TO_UPLOAD; do
151
-
ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/$f \
151
+
ci-fairy s3cp --token-file "${S3_JWT_FILE}" /kernel/$f \
152
152
https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/$f
153
153
done
154
154
···
165
165
cp .config artifacts/${CI_JOB_NAME}_config
166
166
167
167
for image in ${KERNEL_IMAGE_NAME}; do
168
-
cp /lava-files/$image artifacts/install/.
168
+
cp /kernel/$image artifacts/install/.
169
169
done
170
170
171
171
tar -C artifacts -cf artifacts/install.tar install
+8
drivers/gpu/drm/ci/build.yml
+8
drivers/gpu/drm/ci/build.yml
···
143
143
rules:
144
144
- when: never
145
145
146
+
debian-arm64-ubsan:
147
+
rules:
148
+
- when: never
149
+
146
150
debian-build-testing:
147
151
rules:
148
152
- when: never
···
184
180
- when: never
185
181
186
182
debian-testing-msan:
183
+
rules:
184
+
- when: never
185
+
186
+
debian-testing-ubsan:
187
187
rules:
188
188
- when: never
189
189
+24
drivers/gpu/drm/ci/container.yml
+24
drivers/gpu/drm/ci/container.yml
···
24
24
rules:
25
25
- when: never
26
26
27
+
debian/arm32_test-base:
28
+
rules:
29
+
- when: never
30
+
31
+
debian/arm32_test-gl:
32
+
rules:
33
+
- when: never
34
+
35
+
debian/arm32_test-vk:
36
+
rules:
37
+
- when: never
38
+
27
39
debian/arm64_test-gl:
28
40
rules:
29
41
- when: never
···
44
32
rules:
45
33
- when: never
46
34
35
+
debian/baremetal_arm32_test:
36
+
rules:
37
+
- when: never
38
+
47
39
debian/ppc64el_build:
48
40
rules:
49
41
- when: never
50
42
51
43
debian/s390x_build:
44
+
rules:
45
+
- when: never
46
+
47
+
debian/x86_32_build:
48
+
rules:
49
+
- when: never
50
+
51
+
debian/x86_64_test-android:
52
52
rules:
53
53
- when: never
54
54
+31
-1
drivers/gpu/drm/ci/gitlab-ci.yml
+31
-1
drivers/gpu/drm/ci/gitlab-ci.yml
···
1
1
variables:
2
2
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
3
-
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 7d3062470f3ccc6cb40540e772e902c7e2248024
3
+
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 82ab58f6c6f94fa80ca7e1615146f08356e3ba69
4
4
5
5
UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git
6
6
TARGET_BRANCH: drm-next
···
182
182
# Build everything in scheduled pipelines
183
183
- if: *is-scheduled-pipeline
184
184
when: on_success
185
+
# Allow building everything in fork pipelines, but build nothing unless
186
+
# manually triggered
187
+
- when: manual
188
+
189
+
190
+
# Repeat of the above but with `when: on_success` replaced with
191
+
# `when: delayed` + `start_in:`, for build-only jobs.
192
+
# Note: make sure the branches in this list are the same as in
193
+
# `.container+build-rules` above.
194
+
.build-only-delayed-rules:
195
+
rules:
196
+
- !reference [.common-rules, rules]
197
+
# Run when re-enabling a disabled farm, but not when disabling it
198
+
- !reference [.disable-farm-mr-rules, rules]
199
+
# Never run immediately after merging, as we just ran everything
200
+
- !reference [.never-post-merge-rules, rules]
201
+
# Build everything in merge pipelines
202
+
- if: *is-merge-attempt
203
+
when: delayed
204
+
start_in: &build-delay 5 minutes
205
+
# Same as above, but for pre-merge pipelines
206
+
- if: *is-pre-merge
207
+
when: manual
208
+
# Build everything after someone bypassed the CI
209
+
- if: *is-direct-push
210
+
when: manual
211
+
# Build everything in scheduled pipelines
212
+
- if: *is-scheduled-pipeline
213
+
when: delayed
214
+
start_in: *build-delay
185
215
# Allow building everything in fork pipelines, but build nothing unless
186
216
# manually triggered
187
217
- when: manual
+2
-1
drivers/gpu/drm/ci/lava-submit.sh
+2
-1
drivers/gpu/drm/ci/lava-submit.sh
···
48
48
rm -rf results
49
49
mkdir -p results/job-rootfs-overlay/
50
50
51
-
artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
51
+
artifacts/ci-common/export-gitlab-job-env-for-dut.sh \
52
+
> results/job-rootfs-overlay/set-job-env-vars.sh
52
53
cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
53
54
cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
54
55
+1
-1
drivers/gpu/drm/ci/test.yml
+1
-1
drivers/gpu/drm/ci/test.yml