Module: Mesa Branch: staging/23.2 Commit: d32d759e60072c7104c77ab9c1476e4631834e35 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d32d759e60072c7104c77ab9c1476e4631834e35
Author: David Heidelberg <[email protected]> Date: Tue Jul 18 01:08:19 2023 +0200 ci/microsoft: when re-enabling Windows Farm, always run the container Otherwise, Marge queue has to wait for someone manually trigger it. Fixes: d3b66356 ("ci/microsoft: partly revert rename from container-rules to manual-rules") Acked-by: Daniel Stone <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24048> (cherry picked from commit a6edac376405ac0f3cf0ced7d85f0939b05006e7) --- .gitlab-ci/farm-rules.yml | 2 +- .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml index 12510a4c8d5..24e6c2dc8af 100644 --- a/.gitlab-ci/farm-rules.yml +++ b/.gitlab-ci/farm-rules.yml @@ -29,7 +29,7 @@ when: never - changes: [ .ci-farms-disabled/microsoft ] if: '$CI_PIPELINE_SOURCE != "schedule"' - when: manual + when: on_success - !reference [.microsoft-farm-rules, rules] diff --git a/.pick_status.json b/.pick_status.json index 81bac292493..9703ddda29d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1404,7 +1404,7 @@ "description": "ci/microsoft: when re-enabling Windows Farm, always run the container", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d3b6635663f71ef65230ea4a8b321a22a64a9e26", "notes": null
