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

(PDK-1366) Update default operatingsystem versions #682

Merged
merged 1 commit into from
Jun 25, 2019
Merged

(PDK-1366) Update default operatingsystem versions #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions lib/pdk/module/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Metadata
},
{
'operatingsystem' => 'RedHat',
'operatingsystemrelease' => ['7'],
'operatingsystemrelease' => ['8'],
},
{
'operatingsystem' => 'Scientific',
Expand All @@ -30,32 +30,32 @@ class Metadata
'Debian based Linux' => [
{
'operatingsystem' => 'Debian',
'operatingsystemrelease' => ['8'],
'operatingsystemrelease' => ['9'],
},
{
'operatingsystem' => 'Ubuntu',
'operatingsystemrelease' => ['16.04'],
'operatingsystemrelease' => ['18.04'],
},
],
'Fedora' => {
'operatingsystem' => 'Fedora',
'operatingsystemrelease' => ['25'],
'operatingsystemrelease' => ['29'],
},
'OSX' => {
'operatingsystem' => 'Darwin',
'operatingsystemrelease' => ['16'],
},
'SLES' => {
'operatingsystem' => 'SLES',
'operatingsystemrelease' => ['12'],
'operatingsystemrelease' => ['15'],
},
'Solaris' => {
'operatingsystem' => 'Solaris',
'operatingsystemrelease' => ['11'],
},
'Windows' => {
'operatingsystem' => 'windows',
'operatingsystemrelease' => ['2008 R2', '2012 R2', '10'],
'operatingsystemrelease' => %w[2019 10],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is a bit tricky. The most common Server OS right now is either 2016 or 2012R2, but 2019 is the latest.

},
}.freeze

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/new_module_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'template-ref' => match(%r{(master-)|(^(tags/)?(\d+)\.(\d+)\.(\d+))}),
'operatingsystem_support' => include(
'operatingsystem' => 'Debian',
'operatingsystemrelease' => ['8'],
'operatingsystemrelease' => ['9'],
),
)
end
Expand Down
8 changes: 4 additions & 4 deletions spec/acceptance/test_unit_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
describe command('pdk test unit') do
its(:exit_status) { is_expected.to eq(0) }
its(:stderr) { is_expected.to match(%r{preparing to run the unit tests}i) }
its(:stderr) { is_expected.to match(%r{running unit tests.*8 tests.*0 failures}im) }
its(:stderr) { is_expected.to match(%r{running unit tests.*[1-9]\d* tests.*0 failures}im) }
end

describe command('pdk test unit --parallel') do
its(:exit_status) { is_expected.to eq(0) }
its(:stderr) { is_expected.to match(%r{preparing to run the unit tests}i) }
its(:stderr) { is_expected.to match(%r{running unit tests in parallel.*8 tests.*0 failures}im) }
its(:stderr) { is_expected.to match(%r{running unit tests in parallel.*[1-9]\d* tests.*0 failures}im) }
end
end

Expand Down Expand Up @@ -204,12 +204,12 @@

describe command('pdk test unit') do
its(:exit_status) { is_expected.to eq(0) }
its(:stderr) { is_expected.to match(%r{running unit tests.*16 tests.*0 failures}im) }
its(:stderr) { is_expected.to match(%r{running unit tests.*[1-9]\d* tests.*0 failures}im) }
end

describe command('pdk test unit --parallel') do
its(:exit_status) { is_expected.to eq(0) }
its(:stderr) { is_expected.to match(%r{running unit tests in parallel.*16 tests.*0 failures}im) }
its(:stderr) { is_expected.to match(%r{running unit tests in parallel.*[1-9]\d* tests.*0 failures}im) }
end
end

Expand Down
14 changes: 7 additions & 7 deletions spec/unit/pdk/generate/module_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,23 +387,23 @@
},
{
'operatingsystem' => 'RedHat',
'operatingsystemrelease' => ['7'],
'operatingsystemrelease' => ['8'],
},
{
'operatingsystem' => 'Scientific',
'operatingsystemrelease' => ['7'],
},
{
'operatingsystem' => 'Debian',
'operatingsystemrelease' => ['8'],
'operatingsystemrelease' => ['9'],
},
{
'operatingsystem' => 'Ubuntu',
'operatingsystemrelease' => ['16.04'],
'operatingsystemrelease' => ['18.04'],
},
{
'operatingsystem' => 'windows',
'operatingsystemrelease' => ['2008 R2', '2012 R2', '10'],
'operatingsystemrelease' => %w[2019 10],
},
],
)
Expand Down Expand Up @@ -644,15 +644,15 @@
'operatingsystem_support' => [
{
'operatingsystem' => 'Debian',
'operatingsystemrelease' => ['8'],
'operatingsystemrelease' => ['9'],
},
{
'operatingsystem' => 'Ubuntu',
'operatingsystemrelease' => ['16.04'],
'operatingsystemrelease' => ['18.04'],
},
{
'operatingsystem' => 'windows',
'operatingsystemrelease' => ['2008 R2', '2012 R2', '10'],
'operatingsystemrelease' => %w[2019 10],
},
{
'operatingsystem' => 'Solaris',
Expand Down