From 26e139c776170a38ffa4242608b85b71f3fd21da Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Thu, 11 Mar 2021 18:17:52 +0100
Subject: [PATCH] ci: Disable valgrind in some build jobs

Once the glcpp valgrind test works as intended again, it would delay
the dependent test jobs by ~1-4 minutes.

The meson-clover job would run the glcpp valgrind test multiple times
and take more than 10 minutes to finish.

valgrind can't work in the meson-android job, would need an ARM backend.

v2:
* Disable in meson-clover as well.

Reviewed-by: Dylan Baker <dylan.c.baker@intel.com> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>
---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c0d74b..d33fb7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -654,6 +654,7 @@ meson-testing:
     VULKAN_DRIVERS: "swrast,amd"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
+      -D valgrind=false
       -D werror=true
     MINIO_ARTIFACT_NAME: mesa-amd64
   script:
@@ -666,6 +667,7 @@ meson-testing-asan:
   variables:
     EXTRA_OPTION: >
       -D b_sanitize=address
+      -D valgrind=false
     MINIO_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
 
@@ -686,6 +688,7 @@ meson-clover-testing:
     GALLIUM_DRIVERS: "swrast"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
+      -D valgrind=false
       -D werror=true
   script:
     - .gitlab-ci/meson/build.sh
@@ -766,6 +769,7 @@ meson-android:
       -D android-stub=true
       -D llvm=disabled
       -D platform-sdk-version=26
+      -D valgrind=false
     GALLIUM_ST: >
       -D dri3=disabled
       -D gallium-vdpau=disabled
@@ -829,6 +833,7 @@ meson-armhf:
     LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D llvm=disabled
+      -D valgrind=false
     MINIO_ARTIFACT_NAME: mesa-armhf
   script:
     - .gitlab-ci/meson/build.sh
@@ -842,6 +847,7 @@ meson-arm64:
     VULKAN_DRIVERS: "freedreno,broadcom"
     EXTRA_OPTION: >
       -D llvm=disabled
+      -D valgrind=false
     MINIO_ARTIFACT_NAME: mesa-arm64
   script:
     - .gitlab-ci/meson/build.sh
@@ -854,6 +860,7 @@ meson-arm64-asan:
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
+      -D valgrind=false
     ARTIFACTS_DEBUG_SYMBOLS: 1
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
     MESON_TEST_ARGS: "--no-suite mesa:compiler"
@@ -943,6 +950,7 @@ meson-clover:
       -D gallium-nine=false
       -D gallium-opencl=icd
     EXTRA_OPTION: >
+      -D valgrind=false
       -D werror=true
   script:
     - LLVM_VERSION=8 .gitlab-ci/meson/build.sh
-- 
2.7.4