Skip to content

Commit 9b9c6e8

Browse files
committed
pdksync - (maint) Update pdk-template to f778803
1 parent 4aee223 commit 9b9c6e8

File tree

6 files changed

+36
-13
lines changed

6 files changed

+36
-13
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

+24-7
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,34 +11,52 @@ script:
1211
- 'bundle exec rake $CHECK'
1312
bundler_args: --without system_tests
1413
rvm:
15-
- 2.5.1
14+
- 2.5.3
1615
env:
1716
global:
18-
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
1917
- GEM_BOLT=true
18+
stages:
19+
- static
20+
- spec
21+
- acceptance
22+
-
23+
if: tag =~ ^v\d
24+
name: deploy
2025
matrix:
2126
fast_finish: true
2227
include:
2328
-
2429
bundler_args:
2530
dist: trusty
2631
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
27-
rvm: 2.5.1
32+
rvm: 2.5.3
2833
script: bundle exec rake beaker
2934
services: docker
35+
stage: acceptance
3036
sudo: required
3137
-
3238
bundler_args:
3339
dist: trusty
3440
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
35-
rvm: 2.5.1
41+
rvm: 2.5.3
3642
script: bundle exec rake beaker
3743
services: docker
44+
stage: acceptance
3845
sudo: required
3946
-
40-
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
47+
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
48+
stage: static
4149
-
42-
env: CHECK=parallel_spec
50+
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
51+
rvm: 2.4.5
52+
stage: spec
53+
-
54+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
55+
rvm: 2.5.3
56+
stage: spec
57+
-
58+
env: DEPLOY_TO_FORGE=yes
59+
stage: deploy
4360
branches:
4461
only:
4562
- master

appveyor.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ version: 1.1.x.{build}
33
branches:
44
only:
55
- master
6+
- release
67
skip_commits:
78
message: /^\(?doc\)?.*/
89
clone_depth: 10

metadata.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"summary": "Tasks that allows the execution of a command and parameters",
66
"license": "Apache-2.0",
77
"source": "https://github.com/puppetlabs/puppetlabs-exec",
8-
"dependencies": [],
8+
"dependencies": [
9+
10+
],
911
"operatingsystem_support": [
1012
{
1113
"operatingsystem": "Debian",
@@ -62,7 +64,7 @@
6264
"version_requirement": ">= 5.5.10 < 7.0.0"
6365
}
6466
],
65-
"pdk-version": "1.9.0",
66-
"template-url": "https://github.com/puppetlabs/pdk-templates/",
67-
"template-ref": "heads/master-0-gfde5699"
67+
"pdk-version": "1.10.0",
68+
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
69+
"template-ref": "heads/master-0-gf778803"
6870
}

0 commit comments

Comments
 (0)