| Message ID | 20240807082020.429434-1-vignesh.raman@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] drm/ci: uprev mesa | expand |
On Wed, 7 Aug 2024 at 09:21, Vignesh Raman <vignesh.raman@collabora.com> wrote: > 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 <daniels@collabora.com>
Hi Vignesh, On 8/7/24 05:20, Vignesh Raman wrote: > 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 <vignesh.raman@collabora.com> > --- > > 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(-) > > diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml > index d6edf3635b23..2a94f54ce4cf 100644 > --- a/drivers/gpu/drm/ci/container.yml > +++ b/drivers/gpu/drm/ci/container.yml > @@ -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 > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index 6d2cefa7f15e..eca47d4f816f 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -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 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 > > 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 > diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml > index 13eda37bdf05..2c340d063a96 100644 > --- a/drivers/gpu/drm/ci/image-tags.yml > +++ b/drivers/gpu/drm/ci/image-tags.yml > @@ -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}" > \ No newline at end of file > diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh > index 0707fa706a48..6add15083c78 100755 > --- a/drivers/gpu/drm/ci/lava-submit.sh > +++ b/drivers/gpu/drm/ci/lava-submit.sh > @@ -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}" \ > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml > index b22b2cf8f06f..b6f428cdaf94 100644 > --- a/drivers/gpu/drm/ci/test.yml > +++ b/drivers/gpu/drm/ci/test.yml > @@ -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
Hi Maíra, On 08/08/24 17:01, Maíra Canal wrote: > Hi Vignesh, > > On 8/7/24 05:20, Vignesh Raman wrote: >> 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 <vignesh.raman@collabora.com> >> --- >> >> 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(-) >> >> diff --git a/drivers/gpu/drm/ci/container.yml >> b/drivers/gpu/drm/ci/container.yml >> index d6edf3635b23..2a94f54ce4cf 100644 >> --- a/drivers/gpu/drm/ci/container.yml >> +++ b/drivers/gpu/drm/ci/container.yml >> @@ -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 >> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml >> b/drivers/gpu/drm/ci/gitlab-ci.yml >> index 6d2cefa7f15e..eca47d4f816f 100644 >> --- a/drivers/gpu/drm/ci/gitlab-ci.yml >> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml >> @@ -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 > > 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. 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
---- On Wed, 07 Aug 2024 09:33:10 -0300 Daniel Stone wrote --- > On Wed, 7 Aug 2024 at 09:21, Vignesh Raman vignesh.raman@collabora.com> wrote: > > 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 daniels@collabora.com> > Applied to drm-misc-next Thanks
diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml index d6edf3635b23..2a94f54ce4cf 100644 --- a/drivers/gpu/drm/ci/container.yml +++ b/drivers/gpu/drm/ci/container.yml @@ -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 diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 6d2cefa7f15e..eca47d4f816f 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -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 diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml index 13eda37bdf05..2c340d063a96 100644 --- a/drivers/gpu/drm/ci/image-tags.yml +++ b/drivers/gpu/drm/ci/image-tags.yml @@ -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}" \ No newline at end of file diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh index 0707fa706a48..6add15083c78 100755 --- a/drivers/gpu/drm/ci/lava-submit.sh +++ b/drivers/gpu/drm/ci/lava-submit.sh @@ -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}" \ diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index b22b2cf8f06f..b6f428cdaf94 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -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
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 <vignesh.raman@collabora.com> --- 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(-)