From d9c03df584b34e31ae35dec3ab5ba7816cbd9075 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 16 Jun 2022 15:26:53 -0700 Subject: [PATCH] ci: Remove the unused .test-manual Everyone uses .test-manual-mr now, retire the one you don't want. Acked-by: Juan A. Suarez Reviewed-by: Christian Gmeiner Part-of: --- .gitlab-ci.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a785ed8f04..185b75a8e13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -294,25 +294,9 @@ sanity: reports: junit: check-*.xml -# Rules for tests that should not be present in MRs or the main -# project's pipeline (don't block marge or report red on -# mesa/mesa main) but should be present on pipelines in personal -# branches (so you can opt in to running the flaky test when you want -# to). -.test-manual: - rules: - - *ignore_scheduled_pipelines - - if: *is-forked-branch - changes: - *all_paths - when: manual - - when: never - variables: - GIT_STRATEGY: none - JOB_TIMEOUT: 80 - -# The above .test-manual rules doesn't allow the jobs to be available for MRs -# but we should have an option to have manual jobs in MRs as well. +# Rules for tests that should not block merging, but should be available to +# optionally run with the "play" button in the UI in pre-merge non-marge +# pipelines. .test-manual-mr: rules: - *ignore_scheduled_pipelines