Revert "TODO forcefail stage"

This reverts commit 615bee26a5ca34daa37ea0698f924fd8eefd2b8d.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90e02c9c7a746907836d6ca841629a97629c52af..01ef8e0e6b91a0496af7ee5d8f78efff26b48af8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@
 stages:
   - images
   - build
-  - forcefail
 
 variables:
   GIT_STRATEGY: fetch

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 88d9c2bf9771d2a90b5f31575f60313cfc50ca1f..ac2557719538ad762c348c6f3d6c6073ad7e4772 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -67,26 +67,6 @@ services:
       #
       - $SAMBA_CI_REBUILD_IMAGES == "yes"
 
-#
-# We add allow_failure: true to
-# .build_image_template_force_broken
-#  # doesn't work yet
-#  allow_failure: true
-fail_image_template_force_broken:
-  image: docker:latest
-  stage: forcefail
-  tags:
-    - docker
-  before_script:
-    - uname -a
-    - cat /etc/os-release
-  script:
-    - echo "Force to fail at the end..."
-    - /bin/false
-  only:
-    variables:
-      - $SAMBA_CI_REBUILD_BROKEN_IMAGES == "yes"
-
 .build_image_template_force_broken:
   extends: .build_image_template
   variables: