From 9e47c9bc6aecd3a6621d4702a8299b18ce199619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
Date: Fri, 27 Dec 2024 09:08:43 +0100
Subject: [PATCH] ci: make check-tree optional for branches other than main

Old branches tend to be formatted with a different versions of
clang-format, so when patches are backported, they introduce some
differences in formatting, making the check-tree job to fail.

These changes in formatting are normally small, and we don't pay much
attention to them, causing that the pipelines are always red, increasing
the work required to check if there are important failures or not.

Make check-tree optional for branches other than main. This way,
failures will be shown as a "warning", and if a pipeline only shows a
warning we don't need to inspect it.
---
 .gitlab-ci.yml         | 14 +++++++++-----
 .gitlab-ci/ci.template |  4 ++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3b6fd6cb6..6000f905bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-28624746b6b1'
-  CENTOS_TAG:  'tag-ca7bb4b2cd94'
-  DEBIAN_TAG:  'tag-37f5e32f6021'
-  FEDORA_TAG:  'tag-ca7bb4b2cd94'
-  UBUNTU_TAG:  'tag-37f5e32f6021'
+  ALPINE_TAG:  'tag-77ec3d923fd6'
+  CENTOS_TAG:  'tag-3e5d2c24e23c'
+  DEBIAN_TAG:  'tag-ecad19904683'
+  FEDORA_TAG:  'tag-3e5d2c24e23c'
+  UBUNTU_TAG:  'tag-ecad19904683'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -631,6 +631,10 @@ check-tree:
   needs:
     - "tier1:fedora:41@prep"
   rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
+      allow_failure: true
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      allow_failure: true
     - if: $CI_PIPELINE_SOURCE != 'schedule'
   stage: tier1
   script:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 60e8bc2110..3af5cac459 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -214,6 +214,10 @@ check-tree:
   needs:
     - "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep"
   rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
+      allow_failure: true
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      allow_failure: true
     - if: $CI_PIPELINE_SOURCE != 'schedule'
   stage: tier1
   script: