Mesa (staging/20.1): Revert "CI: Disable Lima jobs due to lab unhealthiness"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 30 22:33:51 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: 634b7718a14322054aca0a13a751cb5ae44efd0f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=634b7718a14322054aca0a13a751cb5ae44efd0f
Author: Neil Armstrong <narmstrong at baylibre.com>
Date: Fri Apr 24 11:07:31 2020 +0200
Revert "CI: Disable Lima jobs due to lab unhealthiness"
This reverts commit adeef43d15092a6910dceb3605f5ee3151dd2c47.
The lab has recovered health, thus re-enable Lima jobs.
Acked-by: Michel Dänzer <mdaenzer at redhat.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4727>
(cherry picked from commit 4793c2bcb95eb9abc64ddea7115d1c16df4063aa)
---
.gitlab-ci/lava-gitlab-ci.yml | 4 ++--
.pick_status.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 2e15e923b68..b25753377c6 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -149,7 +149,7 @@ panfrost-t860-gles3:arm64:
tags:
- mesa-ci-aarch64-lava-baylibre
-.lima-mali400-test:armhf:
+lima-mali400-test:armhf:
parallel: 2
extends:
- .lava-test:armhf
@@ -161,7 +161,7 @@ panfrost-t860-gles3:arm64:
tags:
- mesa-ci-aarch64-lava-baylibre
-.lima-mali450-test:arm64:
+lima-mali450-test:arm64:
extends:
- .lava-test:arm64
- .lima-rules
diff --git a/.pick_status.json b/.pick_status.json
index e354caaf911..d53cc67a721 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3721,7 +3721,7 @@
"description": "Revert \"CI: Disable Lima jobs due to lab unhealthiness\"",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "adeef43d15092a6910dceb3605f5ee3151dd2c47"
},
More information about the mesa-commit
mailing list