Mesa (staging/20.3): gitlab-ci: drop deprecated platforms that snuck in when nobody was watching

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 921bd0eabedd46191497023317ee6468e7313b93
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=921bd0eabedd46191497023317ee6468e7313b93

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Fri Nov 20 13:08:09 2020 +0100

gitlab-ci: drop deprecated platforms that snuck in when nobody was watching

... even though I did review that commit. My bad :]

Fixes: c56f09124b195c5cbaab ("gitlab-ci: Move classic driver testing to a new meson-classic job")
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5844>
(cherry picked from commit 4da8323a14b58303b41826382f1951131171da0f)

---

 .gitlab-ci.yml    | 2 +-
 .pick_status.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ad2268d7d5..bdb85845668 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -724,7 +724,7 @@ meson-classic:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,wayland,drm,surfaceless
+      -D platforms=x11,wayland
     DRI_DRIVERS: "auto"
     EXTRA_OPTION: >
       -D osmesa=classic
diff --git a/.pick_status.json b/.pick_status.json
index 7904bd6fca1..40f594c0f64 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -418,7 +418,7 @@
         "description": "gitlab-ci: drop deprecated platforms that snuck in when nobody was watching",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c56f09124b195c5cbaabdd7eadbb0523bede3abb"
     },