diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-05 13:18:10 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-15 13:47:35 +0300 |
| commit | 026896cca27ac63795bf1d0e606f6813500d9475 (patch) | |
| tree | 037d47e705869ec6baee2d6b0618f0c0c70aad08 /lib/gitlab/ci/templates/Chef.gitlab-ci.yml | |
| parent | c32b2d3d2b7d4e2ce8b58eee12b31f1f907e57ed (diff) | |
Merge branch 'require-all-templates-to-include-default-stages' into 'master'
Require all templates to use default stages
Closes #59992
See merge request gitlab-org/gitlab-ce!26954
(cherry picked from commit 39eb16aab2dbac3347f61f83fb60f5448d44e965)
e0df05cf Require all templates to use default stages
Diffstat (limited to 'lib/gitlab/ci/templates/Chef.gitlab-ci.yml')
| -rw-r--r-- | lib/gitlab/ci/templates/Chef.gitlab-ci.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Chef.gitlab-ci.yml b/lib/gitlab/ci/templates/Chef.gitlab-ci.yml index 33507aa58e4..1e14aa8bea9 100644 --- a/lib/gitlab/ci/templates/Chef.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Chef.gitlab-ci.yml @@ -14,9 +14,11 @@ variables: KITCHEN_LOCAL_YAML: ".kitchen.dokken.yml" stages: + - build - lint - - unit + - test - functional + - deploy foodcritic: stage: lint @@ -29,7 +31,7 @@ cookstyle: - chef exec cookstyle . chefspec: - stage: unit + stage: test script: - chef exec rspec spec |