Merge branch 'jprovazn-rails-ci' into 'master'

Trigger rails5 tests if variable is set See merge request gitlab-org/gitlab-ce!20609

Merge branch 'jprovazn-rails-ci' into 'master'
Trigger rails5 tests if variable is set See merge request gitlab-org/gitlab-ce!20609
62563a39 · Rémy Coutable · 86456af1 · d3dcc9d4 · 62563a39
Commit 62563a39 authored Jul 16, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

.gitlab-ci.yml .gitlab-ci.yml +3 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,9 @@ stages:
 .rails5: &rails5
  allow_failure: true
  only:
-    - /rails5/
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /rails5/
+      - $RAILS5_ENABLED
  variables:
    BUNDLE_GEMFILE: "Gemfile.rails5"
    RAILS5: "true"