ci/i915g: Merge the two dEQP runs together.

Fewer buttons for me to have to click for manual MR testing.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12110>

src/gallium/drivers/i915/ci/deqp-i915g.toml

@@ -0,0 +1,21 @@
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = ["/deqp/mustpass/gles2-khr-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]

src/gallium/drivers/i915/ci/gitlab-ci.yml

@@ -16,13 +16,7 @@ i915-g33-deqp:
     - .deqp-test
   variables:
     DEQP_VER: gles2
-
-i915-g33-khr-deqp:
-  extends:
-    - .anholt-g33-test
-    - .deqp-test
-  variables:
-    DEQP_VER: gles2-khr
+    DEQP_SUITE: i915g
 
 i915-g33-piglit:
   extends: