pdksync - (maint) Update pdk-template to f778803

This commit is contained in:
Eimhin Laverty
2019-04-15 10:34:13 +01:00
parent 78bdfa2ffe
commit b8e5438663
5 changed files with 31 additions and 17 deletions

2
.gitignore vendored
View File

@@ -22,5 +22,5 @@
/convert_report.txt /convert_report.txt
/update_report.txt /update_report.txt
.DS_Store .DS_Store
.vscode/
.envrc .envrc
/inventory.yaml

View File

@@ -22,8 +22,8 @@
/convert_report.txt /convert_report.txt
/update_report.txt /update_report.txt
.DS_Store .DS_Store
.vscode/
.envrc .envrc
/inventory.yaml
/appveyor.yml /appveyor.yml
/.fixtures.yml /.fixtures.yml
/Gemfile /Gemfile
@@ -32,8 +32,10 @@
/.gitlab-ci.yml /.gitlab-ci.yml
/.pdkignore /.pdkignore
/Rakefile /Rakefile
/rakelib/
/.rspec /.rspec
/.rubocop.yml /.rubocop.yml
/.travis.yml /.travis.yml
/.yardopts /.yardopts
/spec/ /spec/
/.vscode/

View File

@@ -1 +1 @@
--relative

View File

@@ -1,5 +1,4 @@
--- ---
dist: trusty
language: ruby language: ruby
cache: bundler cache: bundler
before_install: before_install:
@@ -12,10 +11,14 @@ script:
- 'bundle exec rake $CHECK' - 'bundle exec rake $CHECK'
bundler_args: --without system_tests bundler_args: --without system_tests
rvm: rvm:
- 2.5.1 - 2.5.3
env: stages:
global: - static
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0" - spec
- acceptance
-
if: tag =~ ^v\d
name: deploy
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
@@ -23,25 +26,34 @@ matrix:
bundler_args: bundler_args:
dist: trusty dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
rvm: 2.5.1 rvm: 2.5.3
script: bundle exec rake beaker script: bundle exec rake beaker
services: docker services: docker
stage: acceptance
sudo: required sudo: required
- -
bundler_args: bundler_args:
dist: trusty dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
rvm: 2.5.1 rvm: 2.5.3
script: bundle exec rake beaker script: bundle exec rake beaker
services: docker services: docker
stage: acceptance
sudo: required sudo: required
- -
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop" env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
- stage: static
env: CHECK=parallel_spec
- -
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4 rvm: 2.4.5
stage: spec
-
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3
stage: spec
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
branches: branches:
only: only:
- master - master

View File

@@ -77,7 +77,7 @@
"version_requirement": ">= 5.5.10 < 7.0.0" "version_requirement": ">= 5.5.10 < 7.0.0"
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates", "template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "heads/master-0-gfde5699", "template-ref": "heads/master-0-gf778803",
"pdk-version": "1.8.0" "pdk-version": "1.10.0"
} }