From 055cf714e1f577ce8f003e9f32d18b233a948a23 Mon Sep 17 00:00:00 2001
From: Evan Read <eread@gitlab.com>
Date: Sun, 12 May 2019 11:07:31 -0500
Subject: Set documentation pipeline rules for *.md files

Remove requirement for special branch name for docs to
include and exclude jobs. Replace with logic to function
the same way on changes to docs *.md files.
---
 .gitlab/ci/docs.gitlab-ci.yml          | 4 ++--
 .gitlab/ci/frontend.gitlab-ci.yml      | 6 ++++--
 .gitlab/ci/global.gitlab-ci.yml        | 7 ++++---
 .gitlab/ci/rails.gitlab-ci.yml         | 3 ++-
 .gitlab/ci/review.gitlab-ci.yml        | 6 ++++--
 .gitlab/ci/test-metadata.gitlab-ci.yml | 3 ++-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index de1110f39fa..e00c18a8689 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -33,8 +33,8 @@ review-docs-deploy:
     - gem install gitlab --no-document
     - ./$SCRIPT_NAME deploy
   only:
-    - /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ce
-    - /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ee
+    changes:
+      - "doc/**/*.md"
   except:
     - /(^qa[\/-].*|.*-qa$)/
 
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index fe369ffec13..83674944cbf 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -73,7 +73,8 @@ gitlab:assets:compile pull-cache:
     refs:
       - master@gitlab-org/gitlab-ce
       - master@gitlab-org/gitlab-ee
-      - /(^docs[\/-].*|.*-docs$)/
+    changes:
+      - "doc/**/*.md"
 
 .compile-assets-metadata:
   extends: .dedicated-runner
@@ -111,7 +112,8 @@ compile-assets pull-cache:
     refs:
       - master@gitlab-org/gitlab-ce
       - master@gitlab-org/gitlab-ee
-      - /(^docs[\/-].*|.*-docs$)/
+    changes:
+      - "doc/**/*.md"
 
 karma:
   extends: .dedicated-no-docs-pull-cache-job
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 4da7f404767..b91509e7728 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -30,14 +30,15 @@
 
 .no-docs:
   except:
-    refs:
-      - /(^docs[\/-].*|.*-docs$)/
+    changes:
+      - "doc/**/*.md"
 
 .no-docs-and-no-qa:
   except:
     refs:
-      - /(^docs[\/-].*|.*-docs$)/
       - /(^qa[\/-].*|.*-qa$)/
+    changes:
+      - "doc/**/*.md"
 
 .dedicated-no-docs-pull-cache-job:
   extends:
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 1392768127b..751156cbb8b 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -207,8 +207,9 @@ downtime_check:
       - master
       - tags
       - /^[\d-]+-stable(-ee)?$/
-      - /(^docs[\/-].*|.*-docs$)/
       - /(^qa[\/-].*|.*-qa$)/
+    changes:
+      - "doc/**/*.md"
   dependencies:
     - setup-test-env
 
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 41d52c4e095..56e396cbc40 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -7,7 +7,8 @@
   except:
     refs:
       - master
-      - /(^docs[\/-].*|.*-docs$)/
+    changes:
+      - "doc/**/*.md"
 
 .review-schedules-only: &review-schedules-only
   only:
@@ -20,7 +21,8 @@
   except:
     refs:
       - tags
-      - /(^docs[\/-].*|.*-docs$)/
+    changes:
+      - "doc/**/*.md"
 
 .review-base: &review-base
   extends: .dedicated-runner
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index 3a5735a2be9..ff7fca1679d 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -71,8 +71,9 @@ flaky-examples-check:
   except:
     refs:
       - master
-      - /(^docs[\/-].*|.*-docs$)/
       - /(^qa[\/-].*|.*-qa$)/
+    changes:
+      - "doc/**/*.md"
   artifacts:
     expire_in: 30d
     paths:
-- 
cgit v1.2.1