Skip to content

Commit 84d42b3

Browse files
authored
Merge pull request #1333 from puppetlabs/CAT-1750/main/update-puppet-versions
(CAT-1570:CAT-1754) Version updates to code
2 parents 4bce7c5 + 3cd844a commit 84d42b3

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

lib/pdk/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module PDK
22
VERSION = '3.0.1'.freeze
3-
TEMPLATE_REF = '3.0.1'.freeze
3+
TEMPLATE_REF = '3.0.1.1'.freeze
44
end

package-testing/spec/package/update_module_spec.rb

-11
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@
2323
create_remote_file(get_working_node, File.join(module_dir, 'metadata.json'), metadata.to_json)
2424

2525
sync_yaml = YAML.safe_load(URI.open("https://raw.githubusercontent.com/#{mod}/main/.sync.yml").read)
26-
27-
sync_yaml['Gemfile'].each_key do |gem_type|
28-
next unless sync_yaml['Gemfile'][gem_type].respond_to?(:each_key)
29-
30-
sync_yaml['Gemfile'][gem_type].each_key do |group|
31-
sync_yaml['Gemfile'][gem_type][group].select! do |gem|
32-
gem['gem'] =~ /\Apuppet-module-(?:posix|win)-system/
33-
end
34-
end
35-
end
36-
3726
create_remote_file(get_working_node, File.join(module_dir, '.sync.yml'), sync_yaml.to_yaml)
3827
end
3928

package-testing/spec/package/version_selection_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
# test cases to pass. If you are running integration testing prior to a release and its failing due to missing Puppet
77
# gems, verify that the following versions are correct.
88
test_cases = [
9-
{ envvar: 'PDK_PUPPET_VERSION', version: '7.28.0', expected_puppet: '7.28.0', expected_ruby: '2.7.8' },
10-
{ envvar: 'PDK_PUPPET_VERSION', version: '8.4.0', expected_puppet: '8.4.0', expected_ruby: '3.2.2' }
9+
{ envvar: 'PDK_PUPPET_VERSION', expected_puppet: '7.29.1', expected_ruby: '2.7.8' },
10+
{ envvar: 'PDK_PUPPET_VERSION', expected_puppet: '8.5.1', expected_ruby: '3.2.2' }
1111
]
1212

1313
before(:all) do
1414
command("pdk new module #{module_name} --skip-interview").run
1515
end
1616

1717
test_cases.each do |test_case|
18-
context "Select Puppet #{test_case[:version]}" do
19-
let(:env) { { test_case[:envvar] => test_case[:version] } }
18+
context "Select Puppet #{test_case[:expected_puppet]}" do
19+
let(:env) { { test_case[:envvar] => test_case[:expected_puppet] } }
2020
let(:cwd) { module_name }
2121

2222
let(:expected_puppet) { Regexp.escape(test_case[:expected_puppet]) }

0 commit comments

Comments
 (0)