From 9dd106b1137bf94369dfe293cfe800fe2ff642a9 Mon Sep 17 00:00:00 2001 From: Helen Koike Date: Mon, 19 Jun 2023 16:25:17 -0300 Subject: [PATCH] ci: move .microsoft-farm-container-rules to test-source-dep.yml farm rules are placed on test-source-dep.yml, so move it there. This is also useful when trying to re-use the container/gitlab-ci.yml to other workflows without running the jobs. Signed-off-by: Helen Koike Acked-by: David Heidelberg Part-of: --- .gitlab-ci.yml | 10 ---------- .gitlab-ci/test-source-dep.yml | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 061ba171121..608698602fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -204,16 +204,6 @@ stages: when: manual # Otherwise, container jobs won't run because no rule matched. -.microsoft-farm-container-rules: - rules: - # Allow triggering jobs manually in other cases if any files affecting the - # pipeline were changed - - exists: [ .ci-farms-disabled/microsoft ] - when: never - - changes: [ .ci-farms-disabled/microsoft ] - when: manual - - !reference [.microsoft-farm-rules, rules] - # Git archive make git archive: diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 587d58b91ac..10a9e9666e0 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -269,6 +269,16 @@ when: on_success # Farm rules +.microsoft-farm-container-rules: + rules: + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed + - exists: [ .ci-farms-disabled/microsoft ] + when: never + - changes: [ .ci-farms-disabled/microsoft ] + when: manual + - !reference [.microsoft-farm-rules, rules] + .microsoft-farm-rules: rules: - exists: [ .ci-farms-disabled/microsoft ] # 1. Is disabled, never run