Em sex., 14 de mar. de 2025 às 05:59, Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx> escreveu: > > 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@xxxxxxxxxxxxx> > --- > drivers/gpu/drm/ci/build.sh | 16 ++++++++-------- > drivers/gpu/drm/ci/build.yml | 8 ++++++++ > drivers/gpu/drm/ci/container.yml | 24 +++++++++++++++++++++++ > drivers/gpu/drm/ci/gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++- > drivers/gpu/drm/ci/image-tags.yml | 4 +++- > drivers/gpu/drm/ci/lava-submit.sh | 3 ++- > drivers/gpu/drm/ci/test.yml | 2 +- > 7 files changed, 77 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > index 19fe01257ab9..284873e94d8d 100644 > --- a/drivers/gpu/drm/ci/build.sh > +++ b/drivers/gpu/drm/ci/build.sh > @@ -98,14 +98,14 @@ done > > make ${KERNEL_IMAGE_NAME} > > -mkdir -p /lava-files/ > +mkdir -p /kernel/ the folder is not lava specific, correct? > 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 > diff --git a/drivers/gpu/drm/ci/build.yml b/drivers/gpu/drm/ci/build.yml > index 6c0dc10b547c..8eb56ebcf4aa 100644 > --- a/drivers/gpu/drm/ci/build.yml > +++ b/drivers/gpu/drm/ci/build.yml > @@ -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 > diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml > index 07dc13ff865d..56c95c2f91ae 100644 > --- a/drivers/gpu/drm/ci/container.yml > +++ b/drivers/gpu/drm/ci/container.yml > @@ -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 > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index b06b9e7d3d09..55b540c4cf92 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -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 > + Do you think we could avoid repeating code by using anchor (&) and reference (*) ? https://docs.gitlab.com/ci/yaml/yaml_optimization/#yaml-anchors-for-scripts Regards, Helen > + > .ci-deqp-artifacts: > artifacts: > name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" > diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml > index 20049f3626b2..c04ba0e69935 100644 > --- a/drivers/gpu/drm/ci/image-tags.yml > +++ b/drivers/gpu/drm/ci/image-tags.yml > @@ -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 > diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh > index 6e5ac51e8c0a..f22720359b33 100755 > --- a/drivers/gpu/drm/ci/lava-submit.sh > +++ b/drivers/gpu/drm/ci/lava-submit.sh > @@ -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/ > > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml > index dbc4ff50d8ff..84a25f0e783b 100644 > --- a/drivers/gpu/drm/ci/test.yml > +++ b/drivers/gpu/drm/ci/test.yml > @@ -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: > -- > 2.47.2 > -- Helen Koike
