From b72f474ff017b170dbfc75763b37bf1a6575c45c Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 5 Oct 2023 12:52:40 +0100 Subject: [PATCH] docs/ci: rewrite the "farm maintenance ^ other change" rule to mean what we actually meant Sometimes updates to the farm config are needed before re-enabling it, or updating test expectations with new failures that happened while the farm was down, etc. These need to be allowed, as the alternative is to update the config/expectations/etc. blindly in one MR, merge it, and then merge another MR with the farm re-enablement. Part-of: --- docs/ci/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/ci/index.rst b/docs/ci/index.rst index 55115d3..d7aee72 100644 --- a/docs/ci/index.rst +++ b/docs/ci/index.rst @@ -59,7 +59,8 @@ Farm management --------------- .. note:: - Never mix farm maintenance with any other change in the same merge request! + Never mix disabling/re-enabling a farm with any change that can affect a job + that runs in another farm! When the farm starts failing for any reason (power, network, out-of-space), it needs to be disabled by pushing separate MR with -- 2.7.4