summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Armstrong <[email protected]>2020-03-04 14:39:20 +0100
committerEric Engestrom <[email protected]>2020-03-25 15:32:18 +0100
commitd48baa3859a45ff8ff493269992b7ee8a3ffcc5a (patch)
tree940317443bed821f545824476e756db36df9b9cd
parent4b5df32e82af0096cf58ffa3a4443c9e540ee6c3 (diff)
Revert "ci: Remove T820 from CI temporarily"
This reverts commit 089c8f0b8da86a05bde8359c84085e0b795abf17. Our office changes are finished and power is now stable in our lab for T820 CI to run again. Cc: Daniel Stone <[email protected]> Cc: Tomeu Vizoso <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4057> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4057> (cherry picked from commit 4b61ad372d51681a3fb41b2dc21d2d58eb2becac)
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
-rw-r--r--.pick_status.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index da771c5e406..fb820c859c3 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -93,7 +93,7 @@ panfrost-t860-test:arm64:
tags:
- lava-rk3399-gru-kevin
-.panfrost-t820-test:arm64:
+panfrost-t820-test:arm64:
extends: .lava-test:arm64
variables:
DEVICE_TYPE: meson-gxm-khadas-vim2
diff --git a/.pick_status.json b/.pick_status.json
index 41f3eabefdf..d5d0d216378 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2479,7 +2479,7 @@
"description": "Revert \"ci: Remove T820 from CI temporarily\"",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "089c8f0b8da86a05bde8359c84085e0b795abf17"
},