mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
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
This commit is contained in:
parent
c8ba07caae
commit
a8bd38e04a
|
|
@ -98,14 +98,14 @@ done
|
|||
|
||||
make ${KERNEL_IMAGE_NAME}
|
||||
|
||||
mkdir -p /lava-files/
|
||||
mkdir -p /kernel/
|
||||
for image in ${KERNEL_IMAGE_NAME}; do
|
||||
cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
|
||||
cp arch/${KERNEL_ARCH}/boot/${image} /kernel/.
|
||||
done
|
||||
|
||||
if [[ -n ${DEVICE_TREES} ]]; then
|
||||
make dtbs
|
||||
cp ${DEVICE_TREES} /lava-files/.
|
||||
cp ${DEVICE_TREES} /kernel/.
|
||||
fi
|
||||
|
||||
make modules
|
||||
|
|
@ -121,11 +121,11 @@ if [[ ${DEBIAN_ARCH} = "arm64" ]]; then
|
|||
-d arch/arm64/boot/Image.lzma \
|
||||
-C lzma\
|
||||
-b arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb \
|
||||
/lava-files/cheza-kernel
|
||||
/kernel/cheza-kernel
|
||||
KERNEL_IMAGE_NAME+=" cheza-kernel"
|
||||
|
||||
# Make a gzipped copy of the Image for db410c.
|
||||
gzip -k /lava-files/Image
|
||||
gzip -k /kernel/Image
|
||||
KERNEL_IMAGE_NAME+=" Image.gz"
|
||||
fi
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ cp -rfv drivers/gpu/drm/ci/* install/.
|
|||
. .gitlab-ci/container/container_post_build.sh
|
||||
|
||||
if [[ "$UPLOAD_TO_MINIO" = "1" ]]; then
|
||||
xz -7 -c -T${FDO_CI_CONCURRENT:-4} vmlinux > /lava-files/vmlinux.xz
|
||||
xz -7 -c -T${FDO_CI_CONCURRENT:-4} vmlinux > /kernel/vmlinux.xz
|
||||
FILES_TO_UPLOAD="$KERNEL_IMAGE_NAME vmlinux.xz"
|
||||
|
||||
if [[ -n $DEVICE_TREES ]]; then
|
||||
|
|
@ -148,7 +148,7 @@ if [[ "$UPLOAD_TO_MINIO" = "1" ]]; then
|
|||
|
||||
ls -l "${S3_JWT_FILE}"
|
||||
for f in $FILES_TO_UPLOAD; do
|
||||
ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/$f \
|
||||
ci-fairy s3cp --token-file "${S3_JWT_FILE}" /kernel/$f \
|
||||
https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/$f
|
||||
done
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ ln -s common artifacts/install/ci-common
|
|||
cp .config artifacts/${CI_JOB_NAME}_config
|
||||
|
||||
for image in ${KERNEL_IMAGE_NAME}; do
|
||||
cp /lava-files/$image artifacts/install/.
|
||||
cp /kernel/$image artifacts/install/.
|
||||
done
|
||||
|
||||
tar -C artifacts -cf artifacts/install.tar install
|
||||
|
|
|
|||
|
|
@ -143,6 +143,10 @@ debian-arm64-release:
|
|||
rules:
|
||||
- when: never
|
||||
|
||||
debian-arm64-ubsan:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian-build-testing:
|
||||
rules:
|
||||
- when: never
|
||||
|
|
@ -183,6 +187,10 @@ debian-testing-msan:
|
|||
rules:
|
||||
- when: never
|
||||
|
||||
debian-testing-ubsan:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian-vulkan:
|
||||
rules:
|
||||
- when: never
|
||||
|
|
|
|||
|
|
@ -24,6 +24,18 @@ alpine/x86_64_build:
|
|||
rules:
|
||||
- when: never
|
||||
|
||||
debian/arm32_test-base:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/arm32_test-gl:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/arm32_test-vk:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/arm64_test-gl:
|
||||
rules:
|
||||
- when: never
|
||||
|
|
@ -32,6 +44,10 @@ debian/arm64_test-vk:
|
|||
rules:
|
||||
- when: never
|
||||
|
||||
debian/baremetal_arm32_test:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/ppc64el_build:
|
||||
rules:
|
||||
- when: never
|
||||
|
|
@ -40,6 +56,14 @@ debian/s390x_build:
|
|||
rules:
|
||||
- when: never
|
||||
|
||||
debian/x86_32_build:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/x86_64_test-android:
|
||||
rules:
|
||||
- when: never
|
||||
|
||||
debian/x86_64_test-vk:
|
||||
rules:
|
||||
- when: never
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
variables:
|
||||
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
|
||||
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 7d3062470f3ccc6cb40540e772e902c7e2248024
|
||||
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 82ab58f6c6f94fa80ca7e1615146f08356e3ba69
|
||||
|
||||
UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git
|
||||
TARGET_BRANCH: drm-next
|
||||
|
|
@ -187,6 +187,36 @@ stages:
|
|||
- when: manual
|
||||
|
||||
|
||||
# Repeat of the above but with `when: on_success` replaced with
|
||||
# `when: delayed` + `start_in:`, for build-only jobs.
|
||||
# Note: make sure the branches in this list are the same as in
|
||||
# `.container+build-rules` above.
|
||||
.build-only-delayed-rules:
|
||||
rules:
|
||||
- !reference [.common-rules, rules]
|
||||
# Run when re-enabling a disabled farm, but not when disabling it
|
||||
- !reference [.disable-farm-mr-rules, rules]
|
||||
# Never run immediately after merging, as we just ran everything
|
||||
- !reference [.never-post-merge-rules, rules]
|
||||
# Build everything in merge pipelines
|
||||
- if: *is-merge-attempt
|
||||
when: delayed
|
||||
start_in: &build-delay 5 minutes
|
||||
# Same as above, but for pre-merge pipelines
|
||||
- if: *is-pre-merge
|
||||
when: manual
|
||||
# Build everything after someone bypassed the CI
|
||||
- if: *is-direct-push
|
||||
when: manual
|
||||
# Build everything in scheduled pipelines
|
||||
- if: *is-scheduled-pipeline
|
||||
when: delayed
|
||||
start_in: *build-delay
|
||||
# Allow building everything in fork pipelines, but build nothing unless
|
||||
# manually triggered
|
||||
- when: manual
|
||||
|
||||
|
||||
.ci-deqp-artifacts:
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
variables:
|
||||
CONTAINER_TAG: "20250204-mesa-uprev"
|
||||
CONTAINER_TAG: "20250307-mesa-uprev"
|
||||
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
|
||||
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
|
||||
|
||||
|
|
@ -20,3 +20,5 @@ variables:
|
|||
DEBIAN_PYUTILS_TAG: "${CONTAINER_TAG}"
|
||||
|
||||
ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"
|
||||
|
||||
CONDITIONAL_BUILD_ANGLE_TAG: fec96cc945650c5fe9f7188cabe80d8a
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@ ROOTFS_URL="$(get_path_to_artifact lava-rootfs.tar.zst)"
|
|||
rm -rf results
|
||||
mkdir -p results/job-rootfs-overlay/
|
||||
|
||||
artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
|
||||
artifacts/ci-common/export-gitlab-job-env-for-dut.sh \
|
||||
> results/job-rootfs-overlay/set-job-env-vars.sh
|
||||
cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
|
||||
cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
- kvm
|
||||
script:
|
||||
- ln -sf $CI_PROJECT_DIR/install /install
|
||||
- mv install/bzImage /lava-files/bzImage
|
||||
- mv install/bzImage /kernel/bzImage
|
||||
- mkdir -p /lib/modules
|
||||
- install/crosvm-runner.sh install/igt_runner.sh
|
||||
needs:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user