From a1c1cce9dfc2d8400a6726affed80997514fefa0 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 20 Jun 2023 14:37:22 +0100
Subject: [PATCH] ci: avoid running hardware jobs if there are already trivial
 issues

Suggested-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23774>
---
 .gitlab-ci.yml                |  9 +++++++++
 .gitlab-ci/test/gitlab-ci.yml | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 672544ba980..8491103c46f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,3 +249,12 @@ sanity:
     when: on_failure
     reports:
       junit: check-*.xml
+
+
+# Jobs that need to pass before spending hardware resources on further testing
+.required-for-hardware-jobs:
+  needs:
+    - job: clang-format
+      optional: true
+    - job: rustfmt
+      optional: true
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 58ed67d8e78..8c7321ecaf1 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -55,6 +55,7 @@ clang-format:
   needs:
     - debian/x86_64_test-gl
     - debian-testing
+    - !reference [.required-for-hardware-jobs, needs]
 
 .test-vk:
   extends:
@@ -63,6 +64,7 @@ clang-format:
   needs:
     - debian-testing
     - debian/x86_64_test-vk
+    - !reference [.required-for-hardware-jobs, needs]
 
 .test-cl:
   extends:
@@ -70,6 +72,7 @@ clang-format:
     - .use-debian/x86_64_test-gl
   needs:
     - debian/x86_64_test-gl
+    - !reference [.required-for-hardware-jobs, needs]
 
 .test-android:
   extends:
@@ -84,6 +87,7 @@ clang-format:
       artifacts: false  # The Android build will be downloaded later
     - job: debian/x86_64_test-android
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
   timeout: 20m
   script:
     - ./install/cuttlefish-runner.sh
@@ -196,6 +200,7 @@ clang-format:
     - debian/arm32_test
     - job: debian-arm32
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 # ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
 .baremetal-test-arm64:
@@ -209,6 +214,7 @@ clang-format:
     - debian/arm64_test
     - job: debian-arm64
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
 .baremetal-arm32-asan-test:
@@ -222,6 +228,7 @@ clang-format:
     - debian/arm32_test
     - job: debian-arm32-asan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-arm64-asan-test:
   extends:
@@ -234,6 +241,7 @@ clang-format:
     - debian/arm64_test
     - job: debian-arm64-asan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-deqp-test:
   variables:
@@ -389,6 +397,7 @@ clang-format:
   needs:
     - debian/x86_64_test-vk
     - debian-testing
+    - !reference [.required-for-hardware-jobs, needs]
 
 .b2c-test-gl:
   extends:
@@ -397,3 +406,4 @@ clang-format:
   needs:
     - debian/x86_64_test-gl
     - debian-testing
+    - !reference [.required-for-hardware-jobs, needs]