| Message ID | 20241004133126.2436930-2-vignesh.raman@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | drm/ci: add new devices for testing | expand |
Hi Vignesh, On Fri, 4 Oct 2024 at 09:31, Vignesh Raman <vignesh.raman@collabora.com> wrote: > +.software-driver: > + stage: software-driver > + extends: > + - .test-gl > + - .test-rules > + timeout: "1h30m" > + tags: > + - kvm > + script: > + - ln -sf $CI_PROJECT_DIR/install /install > + - mv install/bzImage /lava-files/bzImage > + - mkdir -p /lib/modules > + - mkdir -p $CI_PROJECT_DIR/results > + - ln -sf $CI_PROJECT_DIR/results /results > + - install/crosvm-runner.sh install/igt_runner.sh Instead of inlining this here, can we please move towards reusing more of .gitlab-ci/common/init-stage[12].sh? If those files need to be modified then that's totally fine, but I'd rather have something more predictable, and fewer random pieces of shell in each job section.
Hi Daniel, On 07/10/24 22:07, Daniel Stone wrote: > Hi Vignesh, > > On Fri, 4 Oct 2024 at 09:31, Vignesh Raman <vignesh.raman@collabora.com> wrote: >> +.software-driver: >> + stage: software-driver >> + extends: >> + - .test-gl >> + - .test-rules >> + timeout: "1h30m" >> + tags: >> + - kvm >> + script: >> + - ln -sf $CI_PROJECT_DIR/install /install >> + - mv install/bzImage /lava-files/bzImage >> + - mkdir -p /lib/modules >> + - mkdir -p $CI_PROJECT_DIR/results >> + - ln -sf $CI_PROJECT_DIR/results /results >> + - install/crosvm-runner.sh install/igt_runner.sh > > Instead of inlining this here, can we please move towards reusing more > of .gitlab-ci/common/init-stage[12].sh? If those files need to be > modified then that's totally fine, but I'd rather have something more > predictable, and fewer random pieces of shell in each job section. Sure. I will look into init-stage[12].sh and see if we can reuse it. Thanks. Regards, Vignesh
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 09d8447840e9..81472451ccd1 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -88,6 +88,26 @@ tags: - $RUNNER_TAG +.software-driver: + stage: software-driver + extends: + - .test-gl + - .test-rules + timeout: "1h30m" + tags: + - kvm + script: + - ln -sf $CI_PROJECT_DIR/install /install + - mv install/bzImage /lava-files/bzImage + - mkdir -p /lib/modules + - mkdir -p $CI_PROJECT_DIR/results + - ln -sf $CI_PROJECT_DIR/results /results + - install/crosvm-runner.sh install/igt_runner.sh + needs: + - debian/x86_64_test-gl + - testing:x86_64 + - igt:x86_64 + .msm-sc7180: extends: - .lava-igt:arm64 @@ -414,47 +434,16 @@ panfrost:g12b: - .panfrost-gpu virtio_gpu:none: - stage: software-driver - timeout: "1h30m" + extends: + - .software-driver variables: CROSVM_GALLIUM_DRIVER: llvmpipe DRIVER_NAME: virtio_gpu GPU_VERSION: none - extends: - - .test-gl - - .test-rules - tags: - - kvm - script: - - ln -sf $CI_PROJECT_DIR/install /install - - mv install/bzImage /lava-files/bzImage - - mkdir -p $CI_PROJECT_DIR/results - - ln -sf $CI_PROJECT_DIR/results /results - - install/crosvm-runner.sh install/igt_runner.sh - needs: - - debian/x86_64_test-gl - - testing:x86_64 - - igt:x86_64 vkms:none: - stage: software-driver - timeout: "1h30m" + extends: + - .software-driver variables: DRIVER_NAME: vkms GPU_VERSION: none - extends: - - .test-gl - - .test-rules - tags: - - kvm - script: - - ln -sf $CI_PROJECT_DIR/install /install - - mv install/bzImage /lava-files/bzImage - - mkdir -p /lib/modules - - mkdir -p $CI_PROJECT_DIR/results - - ln -sf $CI_PROJECT_DIR/results /results - - ./install/crosvm-runner.sh ./install/igt_runner.sh - needs: - - debian/x86_64_test-gl - - testing:x86_64 - - igt:x86_64
Move common job configuration for software-driver stage jobs to seperate job. Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> --- drivers/gpu/drm/ci/test.yml | 59 +++++++++++++++---------------------- 1 file changed, 24 insertions(+), 35 deletions(-)