From 6f4ad342e5ee745d181a7c253587fb2d793b4c74 Mon Sep 17 00:00:00 2001
From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com>
Date: Fri, 8 Mar 2024 16:46:50 +0100
Subject: [PATCH 1/2] fix(ci): Allow tagged pipelines to fail

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8d26a6d97..b1c34213fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,12 @@ variables:
 
 unittests:
   image: $DOCLI_IMAGE
-  stage: Unit Tests
+
+  rules:
+    # Allow release pipelines to fail
+    - if: $CI_COMMIT_TAG != null
+      allow_failure: true
+    - when: always
 
   services:
     - name: mariadb:10.6
-- 
GitLab


From cf48c6d1e7fff67762b61755c702b63c02684200 Mon Sep 17 00:00:00 2001
From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com>
Date: Fri, 8 Mar 2024 16:47:00 +0100
Subject: [PATCH 2/2] chore(ci): Rename jobs

---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1c34213fc..ca6668978c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,15 @@ include:
     file: "/.gitlab-ci.base.yml"
 
 stages:
-  - Unit Tests
-  - Docker Dokos
+  - Test
+  - Build
 
 variables:
   DOCLI_IMAGE: "registry.gitlab.com/dokos/docli:ci-develop"
 
-unittests:
+tests:
   image: $DOCLI_IMAGE
+  stage: Test
 
   rules:
     # Allow release pipelines to fail
@@ -56,8 +57,8 @@ unittests:
   script:
     - bench --site test_site run-parallel-tests --app erpnext
 
-build_docker:
-  stage: Docker Dokos
+docker:
+  stage: Build
   rules:  # Run if the commit is tagged or if its message contains "[build-docker]"
     - if: $CI_COMMIT_TAG != null
     - if: $CI_COMMIT_MESSAGE =~ /\[build-docker\]/
-- 
GitLab