Skip to content

Commit

Permalink
Update gitlab template
Browse files Browse the repository at this point in the history
  • Loading branch information
David Hollinger committed May 3, 2018
1 parent 8df12fe commit dcc1f0b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ Gitlab CI uses a .gitlab-ci.yml file in the root of your repository tell Gitlab

Key | Description |
| :------------- |:--------------|
| override |Defines whether your local `.sync.yml` will ignore the default values in pdk-templates. Defaults to `false`|
| stages |Defines a job stage for when the CI/CD jobs will be executed in the pipeline.|
| env |Allows you to set any environment variables for the travis build. Currently includes setting the Puppet gem version.|
| variables |Allows you to set any environment variables for the travis build. Currently includes setting the Puppet gem version.|
| bunder\_args |Define any arguments you want to pass through to bundler. The default is `--without system_tests` which avoids installing unnessesary gems.|
| jobs |Define the actual Gitlab CI jobs that will be executed. Please see the [.gitlab-ci.yml](https://docs.gitlab.com/ce/ci/yaml/README.html) docs for specifics. Default jobs are created for `rubocop`, `syntax`, `metadata_lint`, and `rspec-puppet` tests on ruby versions `2.1.9` and `2.4.1`.|

Expand Down
4 changes: 2 additions & 2 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,8 @@ Gemfile:
.gitlab-ci.yml:
defaults:
stages:
- syntax
- unit
- syntax
- unit
variables:
PUPPET_GEM_VERSION: "~> 5.0"
bundler_args: --without system_tests
Expand Down

0 comments on commit dcc1f0b

Please sign in to comment.