From d4dcee7a8a02488d2f860ebe23e12f9341f75b9e Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 2 Aug 2022 19:24:28 -0300 Subject: [PATCH] ci/skqp: Remove .baremetal-skqp-test in favor of .skqp-test Both hidden jobs has the same content, let's reuse it. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 5 ----- src/freedreno/ci/gitlab-ci.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index d7611b15b33..d32c4ccaae9 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -181,11 +181,6 @@ HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" FDO_CI_CONCURRENT: 0 # Default to number of CPUs -.baremetal-skqp-test: - variables: - HWCI_START_XORG: 1 - HWCI_TEST_SCRIPT: "/install/skqp-runner.sh" - # For Valve's bare-metal testing farm jobs. .b2c-test: # It would be nice to use ci-templates within Mesa CI for this job's diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 757a46e28ca..554c51808bf 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -203,7 +203,7 @@ a630_gles_asan: a630_skqp: extends: - - .baremetal-skqp-test + - .skqp-test - .a630-test - .freedreno-turnip-rules variables: