Skip to content

Commit d6fbfd3

Browse files
committed
Update to pdk v2.5.0
* Automatically update via pdk update using PDK v2.5.0 * Add `.sync.yml` per @vStone in jsok#162 to future-proof
1 parent f5cae12 commit d6fbfd3

17 files changed

+920
-654
lines changed

.devcontainer/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM puppet/pdk:latest
2+
3+
# [Optional] Uncomment this section to install additional packages.
4+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
5+
# && apt-get -y install --no-install-recommends <your-package-list-here>
6+

.devcontainer/README.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# devcontainer
2+
3+
4+
For format details, see https://aka.ms/devcontainer.json.
5+
6+
For config options, see the README at:
7+
https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
8+
9+
``` json
10+
{
11+
"name": "Puppet Development Kit (Community)",
12+
"dockerFile": "Dockerfile",
13+
14+
// Set *default* container specific settings.json values on container create.
15+
"settings": {
16+
"terminal.integrated.profiles.linux": {
17+
"bash": {
18+
"path": "bash",
19+
}
20+
}
21+
},
22+
23+
// Add the IDs of extensions you want installed when the container is created.
24+
"extensions": [
25+
"puppet.puppet-vscode",
26+
"rebornix.Ruby"
27+
],
28+
29+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
30+
"forwardPorts": [],
31+
32+
// Use 'postCreateCommand' to run commands after the container is created.
33+
"postCreateCommand": "pdk --version",
34+
}
35+
```
36+
37+
38+

.devcontainer/devcontainer.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Puppet Development Kit (Community)",
3+
"dockerFile": "Dockerfile",
4+
"settings": {
5+
"terminal.integrated.profiles.linux": {
6+
"bash": {
7+
"path": "bash"
8+
}
9+
}
10+
},
11+
"extensions": [
12+
"puppet.puppet-vscode",
13+
"rebornix.Ruby"
14+
]
15+
}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml

.gitlab-ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
stages:
3+
- syntax
4+
- unit
5+
6+
default:
7+
cache:
8+
paths:
9+
- vendor/bundle
10+
11+
before_script: &before_script
12+
- bundle -v
13+
- rm Gemfile.lock || true
14+
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
15+
- "# Set `rubygems_version` in the .sync.yml to set a value"
16+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
17+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
18+
- gem --version
19+
- bundle -v
20+
- bundle install --without system_tests --path vendor/bundle --jobs $(nproc)
21+
22+
validate lint check rubocop-Ruby 2.5.7-Puppet ~> 6:
23+
stage: syntax
24+
image: ruby:2.5.7
25+
script:
26+
- bundle exec rake validate lint check rubocop
27+
variables:
28+
PUPPET_GEM_VERSION: '~> 6'
29+
30+
parallel_spec-Ruby 2.5.7-Puppet ~> 6:
31+
stage: unit
32+
image: ruby:2.5.7
33+
script:
34+
- bundle exec rake parallel_spec
35+
variables:
36+
PUPPET_GEM_VERSION: '~> 6'
37+
38+
validate lint check rubocop-Ruby 2.7.2-Puppet ~> 7:
39+
stage: syntax
40+
image: ruby:2.7.2
41+
script:
42+
- bundle exec rake validate lint check rubocop
43+
variables:
44+
PUPPET_GEM_VERSION: '~> 7'
45+
46+
parallel_spec-Ruby 2.7.2-Puppet ~> 7:
47+
stage: unit
48+
image: ruby:2.7.2
49+
script:
50+
- bundle exec rake parallel_spec
51+
variables:
52+
PUPPET_GEM_VERSION: '~> 7'
53+

.pdkignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,26 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml
29+
/appveyor.yml
30+
/.editorconfig
31+
/.fixtures.yml
32+
/Gemfile
33+
/.gitattributes
34+
/.gitignore
35+
/.gitlab-ci.yml
36+
/.pdkignore
37+
/.puppet-lint.rc
38+
/Rakefile
39+
/rakelib/
40+
/.rspec
41+
/.rubocop.yml
42+
/.travis.yml
43+
/.yardopts
44+
/spec/
45+
/.vscode/
46+
/.sync.yml
47+
/.devcontainer/

.puppet-lint.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--relative

0 commit comments

Comments
 (0)