From 524a75e6ff47731915cecd0b9be3d830d1dcc2bd Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Thu, 27 Aug 2020 15:35:12 +0300
Subject: [PATCH] ci_template: remove rules from the docker build

We can run the jobs always automatically since, most of the
time they will be copying/reffing the existance image in the
registry.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/331>
---
 .gitlab-ci.yml         | 2 --
 gitlab/ci_template.yml | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 048418c..c911c1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,6 @@ include: "gitlab/ci_template.yml"
 test manifest:
   variables:
     GIT_STRATEGY: fetch
-  rules:
-    - when: 'always'
   image: "$TEST_MANIFEST_IMAGE"
   stage: "preparation"
   script:
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 147d342..f9197a0 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -194,15 +194,6 @@ default:
 # All the documentation from citemplates should be applicable here, so please refer there
 .base:
   image: "$CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24"
-  rules:
-    # Always run for detached pipeleines
-    - if: '$CI_MERGE_REQUEST_ID'
-      when: 'always'
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: 'always'
-    - if: '$CI_COMMIT_BRANCH == "$GST_UPS_BRANCH"'
-      when: 'always'
-    - when: 'manual'
   variables:
     STORAGE_DRIVER: 'vfs'
     BUILDAH_FORMAT: 'docker'
-- 
2.7.4