drm/ci: uprev mesa
Subsystems (3)
Vignesh Raman
maintainerPATCH 1/1 drm/ci: uprev mesa
Uprev mesa to adapt to the latest changes in mesa ci. Project 'anholt/deqp-runner' was moved to 'mesa/deqp-runner'. So update the link.
---
v1:
- Working pipeline link,
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1242911
--- drivers/gpu/drm/ci/container.yml | 8 ++++++++ drivers/gpu/drm/ci/gitlab-ci.yml | 22 ++++++++++++---------- drivers/gpu/drm/ci/image-tags.yml | 8 ++++---- drivers/gpu/drm/ci/lava-submit.sh | 1 + drivers/gpu/drm/ci/test.yml | 4 ++-- 5 files changed, 27 insertions(+), 16 deletions(-)
drivers/gpu/drm/ci/container.yml +8 -0
@@ -28,6 +28,14 @@ debian/x86_64_test-vk: rules: - when: never +debian/arm64_test-vk: + rules: + - when: never + +debian/arm64_test-gl: + rules: + - when: never + fedora/x86_64_build: rules: - when: never
drivers/gpu/drm/ci/gitlab-ci.yml +12 -10
@@ -1,13 +1,13 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00 + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha d9849ac46623797a9f56fb9d46dc52460ac477de UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git TARGET_BRANCH: drm-next IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5 - DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git + DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/mesa/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0 FDO_UPSTREAM_REPO: helen.fornazier/linux # The repo where the git-archive daily runs
@@ -85,22 +85,24 @@ include: - project: *drm-ci-project-path ref: *drm-ci-commit-sha file: + - '/.gitlab-ci/container/gitlab-ci.yml' - '/.gitlab-ci/farm-rules.yml' + - '/.gitlab-ci/lava/lava-gitlab-ci.yml' - '/.gitlab-ci/test-source-dep.yml' - - '/.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/amd/ci/gitlab-ci-inc.yml' + - '/src/freedreno/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/drivers/softpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/frontends/rusticl/ci/gitlab-ci.yml' - '/src/intel/ci/gitlab-ci-inc.yml' - - '/src/freedreno/ci/gitlab-ci-inc.yml' - - '/src/amd/ci/gitlab-ci-inc.yml' + - '/src/microsoft/ci/gitlab-ci-inc.yml' + - '/src/nouveau/ci/gitlab-ci-inc.yml' - '/src/virtio/ci/gitlab-ci-inc.yml' - drivers/gpu/drm/ci/image-tags.yml - drivers/gpu/drm/ci/container.yml
drivers/gpu/drm/ci/image-tags.yml +4 -4
@@ -1,15 +1,15 @@ variables: - CONTAINER_TAG: "2024-05-09-mesa-uprev" + CONTAINER_TAG: "2024-08-07-mesa-uprev" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_BASE_TAG: "${CONTAINER_TAG}" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2024-06-10-vkms" + DEBIAN_BUILD_TAG: "${CONTAINER_TAG}" - KERNEL_ROOTFS_TAG: "2023-10-06-amd" + KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl" - DEBIAN_X86_64_TEST_GL_TAG: "${CONTAINER_TAG}" + DEBIAN_TEST_GL_TAG: "${CONTAINER_TAG}" ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"
drivers/gpu/drm/ci/lava-submit.sh +1 -0
@@ -44,6 +44,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \ --first-stage-init artifacts/ci-common/init-stage1.sh \ --ci-project-dir "${CI_PROJECT_DIR}" \ --device-type "${DEVICE_TYPE}" \ + --farm "${FARM}" \ --dtb-filename "${DTB}" \ --jwt-file "${S3_JWT_FILE}" \ --kernel-image-name "${KERNEL_IMAGE_NAME}" \
drivers/gpu/drm/ci/test.yml +2 -2
@@ -69,7 +69,7 @@ .baremetal-igt-arm64: extends: - .baremetal-test-arm64 - - .use-debian/arm64_test + - .use-debian/baremetal_arm64_test - .test-rules variables: FDO_CI_CONCURRENT: 10
@@ -79,7 +79,7 @@ BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS" FARM: google needs: - - debian/arm64_test + - debian/baremetal_arm64_test - job: testing:arm64 artifacts: false - igt:arm64
Signature · 1 line
2.43.0
Quoted 3 lines · Vignesh Raman
Uprev mesa to adapt to the latest changes in mesa ci. Project 'anholt/deqp-runner' was moved to 'mesa/deqp-runner'. So update the link.
Helen Mae Koike Fornazier
Applied---- On Wed, 07 Aug 2024 09:33:10 -0300 Daniel Stone wrote ---
Quoted 7 lines · On Wed, 7 Aug 2024 at 09:21, Vignesh Raman [email protected]> wrote:
Quoted 3 lines
Uprev mesa to adapt to the latest changes in mesa ci. Project 'anholt/deqp-runner' was moved to 'mesa/deqp-runner'. So update the link.
Reviewed-by Daniel Stone [email protected]>
Applied to drm-misc-next
Thanks
Hi Vignesh,
Quoted 46 lines · Vignesh Raman
Uprev mesa to adapt to the latest changes in mesa ci. Project 'anholt/deqp-runner' was moved to 'mesa/deqp-runner'. So update the link.
Signed-off-by Vignesh Raman <[email protected]>---
v1:
- Working pipeline link,https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1242911--- drivers/gpu/drm/ci/container.yml | 8 ++++++++ drivers/gpu/drm/ci/gitlab-ci.yml | 22 ++++++++++++---------- drivers/gpu/drm/ci/image-tags.yml | 8 ++++---- drivers/gpu/drm/ci/lava-submit.sh | 1 + drivers/gpu/drm/ci/test.yml | 4 ++-- 5 files changed, 27 insertions(+), 16 deletions(-)drivers/gpu/drm/ci/container.yml +8
-0@@ -28,6 +28,14 @@ debian/x86_64_test-vk: rules: - when: never +debian/arm64_test-vk: + rules: + - when: never + +debian/arm64_test-gl: + rules: + - when: never + fedora/x86_64_build: rules: - when: neverdrivers/gpu/drm/ci/gitlab-ci.yml +0
-1@@ -1,13 +1,13 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00
drivers/gpu/drm/ci/gitlab-ci.yml line 11
Quoted 10 lines
drivers/gpu/drm/ci/gitlab-ci.yml +2
-1+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha d9849ac46623797a9f56fb9d46dc52460ac477de UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git TARGET_BRANCH: drm-next IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5 - DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git + DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/mesa/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0
Kinda of unrelated to the patch itself, but shouldn't we update DEQP_RUNNER_GIT_TAG? Mesa is already using deqp-runner v0.20.0 and we are still on v0.15.0.
Best Regards,
- Maíra
Quoted 94 lines
drivers/gpu/drm/ci/gitlab-ci.yml +10
-8FDO_UPSTREAM_REPO: helen.fornazier/linux # The repo where the git-archive daily runs@@ -85,22 +85,24 @@ include: - project: *drm-ci-project-path ref: *drm-ci-commit-sha file: + - '/.gitlab-ci/container/gitlab-ci.yml' - '/.gitlab-ci/farm-rules.yml' + - '/.gitlab-ci/lava/lava-gitlab-ci.yml' - '/.gitlab-ci/test-source-dep.yml' - - '/.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/amd/ci/gitlab-ci-inc.yml' + - '/src/freedreno/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/drivers/softpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/frontends/rusticl/ci/gitlab-ci.yml' - '/src/intel/ci/gitlab-ci-inc.yml' - - '/src/freedreno/ci/gitlab-ci-inc.yml' - - '/src/amd/ci/gitlab-ci-inc.yml' + - '/src/microsoft/ci/gitlab-ci-inc.yml' + - '/src/nouveau/ci/gitlab-ci-inc.yml' - '/src/virtio/ci/gitlab-ci-inc.yml' - drivers/gpu/drm/ci/image-tags.yml - drivers/gpu/drm/ci/container.ymldrivers/gpu/drm/ci/image-tags.yml +4
-4@@ -1,15 +1,15 @@ variables: - CONTAINER_TAG: "2024-05-09-mesa-uprev" + CONTAINER_TAG: "2024-08-07-mesa-uprev" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_BASE_TAG: "${CONTAINER_TAG}" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2024-06-10-vkms" + DEBIAN_BUILD_TAG: "${CONTAINER_TAG}" - KERNEL_ROOTFS_TAG: "2023-10-06-amd" + KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl" - DEBIAN_X86_64_TEST_GL_TAG: "${CONTAINER_TAG}" + DEBIAN_TEST_GL_TAG: "${CONTAINER_TAG}" ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"drivers/gpu/drm/ci/lava-submit.sh +1
-0@@ -44,6 +44,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \ --first-stage-init artifacts/ci-common/init-stage1.sh \ --ci-project-dir "${CI_PROJECT_DIR}" \ --device-type "${DEVICE_TYPE}" \ + --farm "${FARM}" \ --dtb-filename "${DTB}" \ --jwt-file "${S3_JWT_FILE}" \ --kernel-image-name "${KERNEL_IMAGE_NAME}" \drivers/gpu/drm/ci/test.yml +2
-2@@ -69,7 +69,7 @@ .baremetal-igt-arm64: extends: - .baremetal-test-arm64 - - .use-debian/arm64_test + - .use-debian/baremetal_arm64_test - .test-rules variables: FDO_CI_CONCURRENT: 10@@ -79,7 +79,7 @@ BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS" FARM: google needs: - - debian/arm64_test + - debian/baremetal_arm64_test - job: testing:arm64 artifacts: false - igt:arm64
Vignesh Raman
maintainerHi Maíra,
Quoted 56 lines · Maíra Canal
Hi Vignesh,
Quoted 53 lines · Vignesh Raman
Uprev mesa to adapt to the latest changes in mesa ci. Project 'anholt/deqp-runner' was moved to 'mesa/deqp-runner'. So update the link.
Signed-off-by Vignesh Raman <[email protected]>---
v1:
- Working pipeline link,https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1242911
---
drivers/gpu/drm/ci/container.yml | 8 ++++++++ drivers/gpu/drm/ci/gitlab-ci.yml | 22 ++++++++++++----------drivers/gpu/drm/ci/image-tags.yml| 8 ++++----drivers/gpu/drm/ci/lava-submit.sh| 1 + drivers/gpu/drm/ci/test.yml | 4 ++--5 files changed, 27 insertions(+), 16 deletions(-)drivers/gpu/drm/ci/container.yml +0
-0@@ -28,6 +28,14 @@ debian/x86_64_test-vk:rules:
- when: neverdrivers/gpu/drm/ci/container.yml +8
-0+debian/arm64_test-vk: + rules: + - when: never + +debian/arm64_test-gl: + rules: + - when: never +fedora/x86_64_build:
rules:
- when: neverdrivers/gpu/drm/ci/gitlab-ci.yml +0
-0@@ -1,13 +1,13 @@variables:
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa -DRM_CI_COMMIT_SHA: &drm-ci-commit-shae2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00
+DRM_CI_COMMIT_SHA: &drm-ci-commit-shad9849ac46623797a9f56fb9d46dc52460ac477de
UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git
TARGET_BRANCH: drm-next
IGT_VERSION:f13702b8e4e847c56da3ef6f0969065d686049c5-DEQP_RUNNER_GIT_URL:
Quoted 8 lines
Quoted 4 lines
https://gitlab.freedesktop.org/anholt/deqp-runner.git
+DEQP_RUNNER_GIT_URL:
https://gitlab.freedesktop.org/mesa/deqp-runner.git
DEQP_RUNNER_GIT_TAG: v0.15.0Kinda of unrelated to the patch itself, but shouldn't we update
DEQP_RUNNER_GIT_TAG? Mesa is already using deqp-runner v0.20.0 and we are still on v0.15.0.
Yes, we need to update deqp-runner also to same version as mesa. I will post a patch with this update. Thank you.
Regards,
Vignesh