diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-24 17:02:22 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-24 17:56:43 +0800 |
| commit | 03cb7935187955ad68a4304a562a94a2eb1f246d (patch) | |
| tree | 710790001ed930feee2bb1998d9da586a8d3f63e | |
| parent | d0c44ee1e2d3a747a2092d60067cd96578089fb4 (diff) | |
| download | gitlab-ce-03cb7935187955ad68a4304a562a94a2eb1f246d.tar.gz | |
Test all on EE, only master on CE, and -mysql branches
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51fa8a6862e..997d8268008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,6 +57,16 @@ stages: variables: GITLAB_DATABASE: "mysql" +.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql + only: + - /\-(?i)mysql$/ + - master@gitlab-org/gitlab-ce + - master@gitlab/gitlabhq + - tags@gitlab-org/gitlab-ce + - tags@gitlab/gitlabhq + - //@gitlab-org/gitlab-ee + - //@gitlab/gitlab-ee + .rspec-knapsack: &rspec-knapsack stage: test <<: *dedicated-runner @@ -83,6 +93,7 @@ stages: .rspec-knapsack-mysql: &rspec-knapsack-mysql <<: *rspec-knapsack <<: *use-mysql + <<: *only-master-and-ee-or-mysql .spinach-knapsack: &spinach-knapsack stage: test @@ -110,6 +121,7 @@ stages: .spinach-knapsack-mysql: &spinach-knapsack-mysql <<: *spinach-knapsack <<: *use-mysql + <<: *only-master-and-ee-or-mysql # Prepare and merge knapsack tests |