Test all on EE, only master on CE, and -mysql branches
This commit is contained in:
parent
d0c44ee1e2
commit
03cb793518
1 changed files with 12 additions and 0 deletions
|
@ -57,6 +57,16 @@ stages:
|
||||||
variables:
|
variables:
|
||||||
GITLAB_DATABASE: "mysql"
|
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
|
.rspec-knapsack: &rspec-knapsack
|
||||||
stage: test
|
stage: test
|
||||||
<<: *dedicated-runner
|
<<: *dedicated-runner
|
||||||
|
@ -83,6 +93,7 @@ stages:
|
||||||
.rspec-knapsack-mysql: &rspec-knapsack-mysql
|
.rspec-knapsack-mysql: &rspec-knapsack-mysql
|
||||||
<<: *rspec-knapsack
|
<<: *rspec-knapsack
|
||||||
<<: *use-mysql
|
<<: *use-mysql
|
||||||
|
<<: *only-master-and-ee-or-mysql
|
||||||
|
|
||||||
.spinach-knapsack: &spinach-knapsack
|
.spinach-knapsack: &spinach-knapsack
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -110,6 +121,7 @@ stages:
|
||||||
.spinach-knapsack-mysql: &spinach-knapsack-mysql
|
.spinach-knapsack-mysql: &spinach-knapsack-mysql
|
||||||
<<: *spinach-knapsack
|
<<: *spinach-knapsack
|
||||||
<<: *use-mysql
|
<<: *use-mysql
|
||||||
|
<<: *only-master-and-ee-or-mysql
|
||||||
|
|
||||||
# Prepare and merge knapsack tests
|
# Prepare and merge knapsack tests
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue