diff options
author | Jorie Tappa <jorie@jorietappa.com> | 2018-08-23 13:01:48 -0700 |
---|---|---|
committer | Jorie Tappa <jorie@jorietappa.com> | 2018-08-23 13:01:48 -0700 |
commit | 92c53840fd8c707f00b6109e4fd81a1ed6d1c094 (patch) | |
tree | 29fc22428339eeaca57f1a626f975176c8f370bd | |
parent | b94412afd6be6155b7384c37378d985826528670 (diff) | |
download | puppet-cron_core-92c53840fd8c707f00b6109e4fd81a1ed6d1c094.tar.gz puppet-cron_core-92c53840fd8c707f00b6109e4fd81a1ed6d1c094.tar.bz2 |
pdk update with spec and gemfile stuffs
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .sync.yml | 25 | ||||
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | Gemfile | 10 | ||||
-rw-r--r-- | metadata.json | 2 |
5 files changed, 40 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d651650..e369e3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ before_script: - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) parallel_spec-Ruby 2.1.9-Puppet ~> 4.0: - stage: syntax + stage: unit image: ruby:2.1.9 script: - bundle exec rake parallel_spec @@ -32,7 +32,7 @@ syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore c PUPPET_GEM_VERSION: '~> 5.5' parallel_spec-Ruby 2.4.4-Puppet ~> 5.5: - stage: syntax + stage: unit image: ruby:2.4.4 script: - bundle exec rake parallel_spec @@ -3,3 +3,28 @@ default_configs: RSpec/NamedSubject: Enabled: false + +Gemfile: + required: + ':system_tests': + - gem: 'puppet-module-posix-system-r#{minor_version}' + platforms: ruby + - gem: 'puppet-module-win-system-r#{minor_version}' + platforms: + - mswin + - mingw + - x64_mingw + - gem: beaker + version: '~> 3.34' + from_env: BEAKER_VERSION + - gem: beaker-abs + from_env: BEAKER_ABS_VERSION + version: '~> 0.5' + - gem: beaker-pe + - gem: beaker-hostgenerator + from_env: BEAKER_HOSTGENERATOR_VERSION + - gem: beaker-rspec + from_env: BEAKER_RSPEC_VERSION + - gem: beaker-puppet + from_env: BEAKER_PUPPET_VERSION + version: '~> 0.14' diff --git a/.travis.yml b/.travis.yml index 5ef0f6f..4ea920d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ matrix: rvm: 2.1.9 branches: only: - - master - - /^v\d/ + - master + - /^v\d/ notifications: email: false deploy: @@ -34,6 +34,16 @@ group :development do gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] end +group :system_tests do + gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.34') + gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.5') + gem "beaker-pe", require: false + gem "beaker-hostgenerator" + gem "beaker-rspec" + gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 0.14') +end puppet_version = ENV['PUPPET_GEM_VERSION'] puppet_type = gem_type(puppet_version) diff --git a/metadata.json b/metadata.json index ca4d9c7..0f2bca6 100644 --- a/metadata.json +++ b/metadata.json @@ -78,5 +78,5 @@ ], "pdk-version": "1.6.0", "template-url": "https://github.com/puppetlabs/pdk-templates.git", - "template-ref": "heads/master-0-g0657063" + "template-ref": "1.7.0-0-g57412ed" } |