Skip to content

Commit e1a6c3c

Browse files
rehanonerehanone
committed
- Updated minimum puppetlabs-vcsrepo version to 4.0.0 and lift the max limit to 7.0.0.
1 parent 33df4d9 commit e1a6c3c

File tree

6 files changed

+46
-74
lines changed

6 files changed

+46
-74
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"settings": {
66
"terminal.integrated.profiles.linux": {
77
"bash": {
8-
"path": "bash",
8+
"path": "bash"
99
}
1010
}
1111
},

‎.pdkignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
/rakelib/
4040
/.rspec
4141
/.rubocop.yml
42-
/.travis.yml
4342
/.yardopts
4443
/spec/
4544
/.vscode/

‎.sync.yml‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,45 @@ appveyor.yml:
2525
secure: "WiS9j4aI93DobVH/O/z6aHKOY8UL2hwn4+fflKuhvZzJPxfsYYfvQsyX43qetpVAIW7DCZLfO1QQlLF1/ywhe8Y9XRy923R6E7WckYPCGtGBpeTdS7p3Biss2H+ikxI9/5UFlewrdFxLxqgKz8lGLCt8zL1r7ggPWjJBfWEBtk2J9mj4BRTTGt6SWTSHwkdqjloQsPu32SXWY4nsU+87p+lO49YTOH2cS+54/DRCpccPl2AL+kXISDGiDZtlMyGdL2c0Z1e8etmOxbHN2X80YyOQY2GiKdGhzVfx5TDPElDXkOO5JkkZWmsz2D6BJYvu+s9awIJ6/pzGFDghZIK2MSgfUjJd9Vwt1lm48kHKsJ3DsSRIOHK+2ft/3nUl8y7j7KKQMcKKVN35/0uy/cXnD4acuxCh84e5bc0pmYy0gxLhLF6C9Ahv8pls7HhA+jaoUBNXIgCb685w6EgrkaeGMx1vz7VfZo56viod/zZ7XCXg8o5s7vthKMtYLnuGIEl2DvBC3KKtGvl4RnzFVUcZcB5lHgLZozskcwuWFtqd/AgqdIVRzKc6KmRWo8TkE/qOV79MaUpKGONmLMQfsz01HMn4m/NAmu4J55kFgFYkrkwy+9c/3Z9Ytce7goOnyxYYd0fFfaSM8vJCl7oe8Zb3znK2atMmpQAfDwYBwUNe1jU="
2626
docker_sets:
2727
- set: ubuntu2204-64
28-
collection: puppet7
28+
collection: puppet8
2929
- set: ubuntu2204-64
30-
collection: puppet6
31-
- set: ubuntu2004-64
3230
collection: puppet7
3331
- set: ubuntu2004-64
34-
collection: puppet6
35-
- set: ubuntu1804-64
32+
collection: puppet8
33+
- set: ubuntu2004-64
3634
collection: puppet7
3735
- set: ubuntu1804-64
38-
collection: puppet6
39-
- set: ubuntu1604-64
36+
collection: puppet8
37+
- set: ubuntu1804-64
4038
collection: puppet7
41-
- set: ubuntu1604-64
42-
collection: puppet6
4339
- set: debian11-64
44-
collection: puppet7
40+
collection: puppet8
4541
- set: debian11-64
46-
collection: puppet6
47-
- set: debian10-64
4842
collection: puppet7
4943
- set: debian10-64
50-
collection: puppet6
51-
- set: debian9-64
44+
collection: puppet8
45+
- set: debian10-64
5246
collection: puppet7
53-
- set: debian9-64
54-
collection: puppet6
55-
# - set: almalinux9-64
56-
# collection: puppet7
57-
# - set: almalinux9-64
58-
# collection: puppet6
59-
- set: almalinux8-64
47+
- set: almalinux9-64
48+
collection: puppet8
49+
- set: almalinux9-64
6050
collection: puppet7
6151
- set: almalinux8-64
62-
collection: puppet6
63-
# - set: rockylinux9-64
64-
# collection: puppet7
65-
# - set: rockylinux9-64
66-
# collection: puppet6
67-
# - set: rockylinux8-64
68-
# collection: puppet7
69-
# - set: rockylinux8-64
70-
# collection: puppet6
71-
# - set: opensuse15-64
72-
# collection: puppet7
73-
# - set: opensuse15-64
74-
# collection: puppet6
52+
collection: puppet8
53+
- set: almalinux8-64
54+
collection: puppet7
55+
# - set: rockylinux9-64
56+
# collection: puppet8
57+
# - set: rockylinux9-64
58+
# collection: puppet7
59+
# - set: rockylinux8-64
60+
# collection: puppet8
61+
# - set: rockylinux8-64
62+
# collection: puppet7
63+
# - set: opensuse15-64
64+
# collection: puppet8
65+
# - set: opensuse15-64
66+
# collection: puppet7
7567
docker_defaults:
7668
dist: focal
7769
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=@@COLLECTION@@ BEAKER_setfile=@@SET@@ BEAKER_TESTMODE=@@TESTMODE@@

‎.travis.yml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
-
3232
bundler_args: --with system_tests
3333
dist: focal
34-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply
34+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply
3535
rvm: 2.5.7
3636
script: bundle exec rake beaker
3737
services: docker
@@ -40,16 +40,7 @@ jobs:
4040
-
4141
bundler_args: --with system_tests
4242
dist: focal
43-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply
44-
rvm: 2.5.7
45-
script: bundle exec rake beaker
46-
services: docker
47-
stage: acceptance
48-
sudo: required
49-
-
50-
bundler_args: --with system_tests
51-
dist: focal
52-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply
43+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply
5344
rvm: 2.5.7
5445
script: bundle exec rake beaker
5546
services: docker
@@ -58,7 +49,7 @@ jobs:
5849
-
5950
bundler_args: --with system_tests
6051
dist: focal
61-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply
52+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply
6253
rvm: 2.5.7
6354
script: bundle exec rake beaker
6455
services: docker
@@ -67,7 +58,7 @@ jobs:
6758
-
6859
bundler_args: --with system_tests
6960
dist: focal
70-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply
61+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply
7162
rvm: 2.5.7
7263
script: bundle exec rake beaker
7364
services: docker
@@ -76,7 +67,7 @@ jobs:
7667
-
7768
bundler_args: --with system_tests
7869
dist: focal
79-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply
70+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply
8071
rvm: 2.5.7
8172
script: bundle exec rake beaker
8273
services: docker
@@ -85,7 +76,7 @@ jobs:
8576
-
8677
bundler_args: --with system_tests
8778
dist: focal
88-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu1604-64 BEAKER_TESTMODE=apply
79+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply
8980
rvm: 2.5.7
9081
script: bundle exec rake beaker
9182
services: docker
@@ -94,7 +85,7 @@ jobs:
9485
-
9586
bundler_args: --with system_tests
9687
dist: focal
97-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 BEAKER_TESTMODE=apply
88+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=debian11-64 BEAKER_TESTMODE=apply
9889
rvm: 2.5.7
9990
script: bundle exec rake beaker
10091
services: docker
@@ -112,7 +103,7 @@ jobs:
112103
-
113104
bundler_args: --with system_tests
114105
dist: focal
115-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian11-64 BEAKER_TESTMODE=apply
106+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=debian10-64 BEAKER_TESTMODE=apply
116107
rvm: 2.5.7
117108
script: bundle exec rake beaker
118109
services: docker
@@ -130,7 +121,7 @@ jobs:
130121
-
131122
bundler_args: --with system_tests
132123
dist: focal
133-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian10-64 BEAKER_TESTMODE=apply
124+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=almalinux9-64 BEAKER_TESTMODE=apply
134125
rvm: 2.5.7
135126
script: bundle exec rake beaker
136127
services: docker
@@ -139,7 +130,7 @@ jobs:
139130
-
140131
bundler_args: --with system_tests
141132
dist: focal
142-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian9-64 BEAKER_TESTMODE=apply
133+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=almalinux9-64 BEAKER_TESTMODE=apply
143134
rvm: 2.5.7
144135
script: bundle exec rake beaker
145136
services: docker
@@ -148,7 +139,7 @@ jobs:
148139
-
149140
bundler_args: --with system_tests
150141
dist: focal
151-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 BEAKER_TESTMODE=apply
142+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet8 BEAKER_setfile=almalinux8-64 BEAKER_TESTMODE=apply
152143
rvm: 2.5.7
153144
script: bundle exec rake beaker
154145
services: docker
@@ -163,15 +154,6 @@ jobs:
163154
services: docker
164155
stage: acceptance
165156
sudo: required
166-
-
167-
bundler_args: --with system_tests
168-
dist: focal
169-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=almalinux8-64 BEAKER_TESTMODE=apply
170-
rvm: 2.5.7
171-
script: bundle exec rake beaker
172-
services: docker
173-
stage: acceptance
174-
sudo: required
175157
-
176158
env: CHECK="validate lint check rubocop"
177159
stage: static

‎Gemfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
1717
minor_version = ruby_version_segments[0..1].join('.')
1818

1919
group :development do
20-
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2120
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21+
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22+
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
24+
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2325
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2426
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2527
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]

‎metadata.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,22 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs-stdlib",
13-
"version_requirement": ">= 6.0.0 < 9.0.0"
13+
"version_requirement": ">= 7.0.0 < 10.0.0"
1414
},
1515
{
1616
"name": "puppetlabs-vcsrepo",
17-
"version_requirement": ">= 3.0.0 < 6.0.0"
17+
"version_requirement": ">= 5.0.0 < 7.0.0"
1818
},
1919
{
2020
"name": "rehan-wget",
21-
"version_requirement": ">= 1.0.0 < 3.0.0"
21+
"version_requirement": ">= 2.0.0 < 4.0.0"
2222
}
2323
],
2424
"operatingsystem_support": [
2525
{
2626
"operatingsystem": "RedHat",
2727
"operatingsystemrelease": [
28-
"6",
29-
"7",
30-
"8"
28+
"9"
3129
]
3230
},
3331
{
@@ -71,7 +69,6 @@
7169
{
7270
"operatingsystem": "Ubuntu",
7371
"operatingsystemrelease": [
74-
"16.04",
7572
"18.04",
7673
"20.04",
7774
"22.04"

0 commit comments

Comments
 (0)