From 5a6ffd1420cecb9d060f386120b94d9b5eafc22e Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 13 Mar 2024 11:10:49 +0000
Subject: [PATCH] zink/ci: add zink+nvk glcts+piglit job on a GA106 (RTX 3060)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28207>
---
 .../drivers/zink/ci/deqp-zink-nvk.toml        | 28 +++++++++++++++++++
 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 25 +++++++++++++++++
 src/gallium/drivers/zink/ci/gitlab-ci.yml     | 11 ++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/gallium/drivers/zink/ci/deqp-zink-nvk.toml

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml b/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml
new file mode 100644
index 00000000000..1d5b0ab9ae4
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml
@@ -0,0 +1,28 @@
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gles2-main.txt",
+    "/deqp/mustpass/gles3-main.txt",
+    "/deqp/mustpass/gles31-main.txt",
+    "/deqp/mustpass/gl46-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+timeout = 180.0
+tests_per_group = 1000
+renderer_check = "zink.*NVK"
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+timeout = 180.0
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"
+  PIGLIT_PLATFORM = "gbm"
+  WAFFLE_PLATFORM = "gbm"
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 24576c3e3e3..07592094ca5 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -62,6 +62,21 @@
     - !reference [.anv-rules, rules]
     - !reference [.zink-common-rules, rules]
 
+.zink-nvk-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.test, rules]
+    - !reference [.nvk-valve-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-nvk-manual-rules:
+  stage: layered-backends
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.test, rules]
+    - !reference [.nvk-valve-manual-rules, rules]
+    - !reference [.zink-common-manual-rules, rules]
+
 .zink-turnip-rules:
   stage: layered-backends
   rules:
@@ -154,6 +169,16 @@
     VK_DRIVER: intel
     GPU_VERSION: zink-anv-tgl
 
+.zink-nvk-glcts-piglit-valve:
+  extends:
+    - .b2c-x86_64-test-gl
+    - .nvk-vkcts
+    - .zink-test
+  variables:
+    DEQP_SUITE: zink-nvk
+    # Disable reporting, since DUTs don't have internet access
+    FLAKES_CHANNEL: ""
+
 .radv-zink-test-valve:
   timeout: 30m
   extends:
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 9dd5989304a..7113a534bc5 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -81,6 +81,17 @@ zink-anv-tgl-traces-restricted:
     PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}
   allow_failure: true
 
+zink-nvk-ga106-glcts-piglit-valve:
+  extends:
+    - .zink-nvk-glcts-piglit-valve
+    - .zink-nvk-manual-rules
+    - .nvk-ga106-valve
+  timeout: 45m  # job runtime 29min, test runtime 27min
+  variables:
+    GPU_VERSION: zink-nvk
+    B2C_TIMEOUT_BOOT_MINUTES: 35
+    B2C_TIMEOUT_OVERALL_MINUTES: 40
+
 zink-tu-a618:
   extends:
     - .lava-test-deqp:arm64