Skip to content

Commit ac54306

Browse files
committedApr 15, 2019
pdksync - (maint) Update pdk-template to f778803
1 parent f3e321a commit ac54306

File tree

5 files changed

+31
-16
lines changed

5 files changed

+31
-16
lines changed
 

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25-
.vscode/
2625
.envrc
26+
/inventory.yaml

‎.pdkignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25-
.vscode/
2625
.envrc
26+
/inventory.yaml
2727
/appveyor.yml
2828
/.fixtures.yml
2929
/Gemfile
@@ -32,8 +32,10 @@
3232
/.gitlab-ci.yml
3333
/.pdkignore
3434
/Rakefile
35+
/rakelib/
3536
/.rspec
3637
/.rubocop.yml
3738
/.travis.yml
3839
/.yardopts
3940
/spec/
41+
/.vscode/

‎.puppet-lint.rc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--relative

‎.travis.yml

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
dist: trusty
32
language: ruby
43
cache: bundler
54
before_install:
@@ -12,36 +11,49 @@ script:
1211
- 'bundle exec rake $CHECK'
1312
bundler_args: --without system_tests
1413
rvm:
15-
- 2.5.1
16-
env:
17-
global:
18-
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
14+
- 2.5.3
15+
stages:
16+
- static
17+
- spec
18+
- acceptance
19+
-
20+
if: tag =~ ^v\d
21+
name: deploy
1922
matrix:
2023
fast_finish: true
2124
include:
2225
-
2326
bundler_args:
2427
dist: trusty
2528
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
26-
rvm: 2.5.1
29+
rvm: 2.5.3
2730
script: bundle exec rake beaker
2831
services: docker
32+
stage: acceptance
2933
sudo: required
3034
-
3135
bundler_args:
3236
dist: trusty
3337
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
34-
rvm: 2.5.1
38+
rvm: 2.5.3
3539
script: bundle exec rake beaker
3640
services: docker
41+
stage: acceptance
3742
sudo: required
3843
-
39-
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
40-
-
41-
env: CHECK=parallel_spec
44+
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
45+
stage: static
4246
-
4347
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
44-
rvm: 2.4.4
48+
rvm: 2.4.5
49+
stage: spec
50+
-
51+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
52+
rvm: 2.5.3
53+
stage: spec
54+
-
55+
env: DEPLOY_TO_FORGE=yes
56+
stage: deploy
4557
branches:
4658
only:
4759
- master

‎metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"version_requirement": ">= 5.5.10 < 7.0.0"
8383
}
8484
],
85-
"pdk-version": "1.8.0",
86-
"template-url": "https://github.com/puppetlabs/pdk-templates",
87-
"template-ref": "heads/master-0-gfde5699"
85+
"pdk-version": "1.10.0",
86+
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87+
"template-ref": "heads/master-0-gf778803"
8888
}

0 commit comments

Comments
 (0)
Please sign in to comment.