drm/ci: uprev mesa version: fix container build & crosvm
When building containers, some rust packages were installed without locking the dependencies version, which got updated and started giving errors like: error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf` Caused by: package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0 A patch to Mesa was added fixing this error, so update it. Also, commit in linux kernel 6.6 rc3 broke booting in crosvm. Mesa has upreved crosvm to fix this issue. Signed-off-by: Helen Koike <helen.koike@collabora.com> [crosvm mesa update] Co-Developed-by: Vignesh Raman <vignesh.raman@collabora.com> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> [v1 container build uprev] Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> Acked-by: Jessica Zhang <quic_jesszhan@quicinc.com> Reviewed-by: David Heidelberg <david.heidelberg@collabora.com> Link: https://lore.kernel.org/r/20231024004525.169002-2-helen.koike@collabora.com Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
parent
b829e932ee
commit
1887de0086
@ -1,6 +1,7 @@
|
||||
.build:
|
||||
extends:
|
||||
- .build-rules
|
||||
- .container+build-rules
|
||||
stage: build
|
||||
artifacts:
|
||||
paths:
|
||||
|
@ -1,6 +1,6 @@
|
||||
variables:
|
||||
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
|
||||
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072
|
||||
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha edfbf74df1d4d6ce54ffe24566108be0e1a98c3d
|
||||
|
||||
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
|
||||
TARGET_BRANCH: drm-next
|
||||
@ -24,6 +24,8 @@ variables:
|
||||
PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
|
||||
# per-job artifact storage on MinIO
|
||||
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
|
||||
# default kernel for rootfs before injecting the current kernel tree
|
||||
KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d
|
||||
|
||||
LAVA_JOB_PRIORITY: 30
|
||||
|
||||
@ -86,6 +88,17 @@ include:
|
||||
- '/.gitlab-ci/container/gitlab-ci.yml'
|
||||
- '/.gitlab-ci/test/gitlab-ci.yml'
|
||||
- '/.gitlab-ci/lava/lava-gitlab-ci.yml'
|
||||
- '/src/microsoft/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
|
||||
- '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml'
|
||||
- '/src/intel/ci/gitlab-ci-inc.yml'
|
||||
- '/src/freedreno/ci/gitlab-ci-inc.yml'
|
||||
- '/src/amd/ci/gitlab-ci-inc.yml'
|
||||
- drivers/gpu/drm/ci/image-tags.yml
|
||||
- drivers/gpu/drm/ci/container.yml
|
||||
- drivers/gpu/drm/ci/static-checks.yml
|
||||
@ -154,6 +167,11 @@ stages:
|
||||
# Run automatically once all dependency jobs have passed
|
||||
- when: on_success
|
||||
|
||||
# When to automatically run the CI for container jobs
|
||||
.container+build-rules:
|
||||
rules:
|
||||
- !reference [.no_scheduled_pipelines-rules, rules]
|
||||
- when: manual
|
||||
|
||||
.ci-deqp-artifacts:
|
||||
artifacts:
|
||||
|
@ -1,5 +1,5 @@
|
||||
variables:
|
||||
CONTAINER_TAG: "2023-08-10-mesa-uprev"
|
||||
CONTAINER_TAG: "2023-10-11-mesa-uprev"
|
||||
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
|
||||
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
|
||||
|
||||
|
@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
|
||||
|
||||
# Prepare env vars for upload.
|
||||
section_start variables "Variables passed through:"
|
||||
KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \
|
||||
KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \
|
||||
artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
|
||||
section_end variables
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user