Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(CAT-1570:CAT-1754) Version updates to code #1333

Merged
merged 3 commits into from
Mar 28, 2024
Merged

(CAT-1570:CAT-1754) Version updates to code #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d86ae74
(CAT-1570) Update Puppet version within Integration Tests
david22swan Mar 20, 2024
f3c90eb
(CAT-1754) Bring in new template version
david22swan Mar 28, 2024
3cd844a
(CAT-1754) Remove test code related to .sync.yml
david22swan Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pdk/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module PDK
VERSION = '3.0.1'.freeze
TEMPLATE_REF = '3.0.1'.freeze
TEMPLATE_REF = '3.0.1.1'.freeze
end
11 changes: 0 additions & 11 deletions package-testing/spec/package/update_module_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@
create_remote_file(get_working_node, File.join(module_dir, 'metadata.json'), metadata.to_json)

sync_yaml = YAML.safe_load(URI.open("https://raw.githubusercontent.com/#{mod}/main/.sync.yml").read)

sync_yaml['Gemfile'].each_key do |gem_type|
next unless sync_yaml['Gemfile'][gem_type].respond_to?(:each_key)

sync_yaml['Gemfile'][gem_type].each_key do |group|
sync_yaml['Gemfile'][gem_type][group].select! do |gem|
gem['gem'] =~ /\Apuppet-module-(?:posix|win)-system/
end
end
end

create_remote_file(get_working_node, File.join(module_dir, '.sync.yml'), sync_yaml.to_yaml)
end

Expand Down
8 changes: 4 additions & 4 deletions package-testing/spec/package/version_selection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
# test cases to pass. If you are running integration testing prior to a release and its failing due to missing Puppet
# gems, verify that the following versions are correct.
test_cases = [
{ envvar: 'PDK_PUPPET_VERSION', version: '7.28.0', expected_puppet: '7.28.0', expected_ruby: '2.7.8' },
{ envvar: 'PDK_PUPPET_VERSION', version: '8.4.0', expected_puppet: '8.4.0', expected_ruby: '3.2.2' }
{ envvar: 'PDK_PUPPET_VERSION', expected_puppet: '7.29.1', expected_ruby: '2.7.8' },
{ envvar: 'PDK_PUPPET_VERSION', expected_puppet: '8.5.1', expected_ruby: '3.2.2' }
]

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

test_cases.each do |test_case|
context "Select Puppet #{test_case[:version]}" do
let(:env) { { test_case[:envvar] => test_case[:version] } }
context "Select Puppet #{test_case[:expected_puppet]}" do
let(:env) { { test_case[:envvar] => test_case[:expected_puppet] } }
let(:cwd) { module_name }

let(:expected_puppet) { Regexp.escape(test_case[:expected_puppet]) }
Expand Down
Loading