From 6bc660a5429d0cae6ea3135c1262be5edbe94b25 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 19 Dec 2023 14:53:24 +0100 Subject: [PATCH] ci/nouveau: move disabled jobs back from include into main gitlab-ci.yml Fixes: 9442571664e5 ("ci: separate hiden jobs to -inc.yml files") Signed-off-by: David Heidelberg Part-of: --- .../drivers/nouveau/ci/gitlab-ci-inc.yml | 17 ----------------- src/gallium/drivers/nouveau/ci/gitlab-ci.yml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml index 0763bd0180b..51f13ade5bd 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml @@ -82,20 +82,3 @@ tags: - google-nouveau-jetson-nano -# Single Jetson Nano board at anholt's house. -.gm20b-gles-full: - extends: - - .gm20b-test - - .nouveau-manual-rules - timeout: 2h - variables: - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" - DEQP_SUITE: nouveau-gm20b - TEST_PHASE_TIMEOUT: 120 - -.gm20b-gles: - extends: - - .gm20b-gles-full - timeout: 30m - variables: - DEQP_FRACTION: 10 diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml index 90ee2b58d82..673d77eaee2 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml @@ -12,3 +12,21 @@ gk20a-gles: DEQP_SUITE: nouveau-gk20a FARM : anholt DEVICE_TYPE: anholt-jetson + +# Single Jetson Nano board at anholt's house. +.gm20b-gles-full: + extends: + - .gm20b-test + - .nouveau-manual-rules + timeout: 2h + variables: + HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" + DEQP_SUITE: nouveau-gm20b + TEST_PHASE_TIMEOUT: 120 + +.gm20b-gles: + extends: + - .gm20b-gles-full + timeout: 30m + variables: + DEQP_FRACTION: 10