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

Jump to bottom

Drop Debian 9 and Ubuntu 16.04, add Debian 10 #548

Merged
merged 1 commit into from
Nov 30, 2019
Merged

Drop Debian 9 and Ubuntu 16.04, add Debian 10 #548

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
2 changes: 1 addition & 1 deletion .sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.travis.yml:
beaker_sets:
- centos7-64
- debian9-64
- debian10-64
env:
global:
- PARALLEL_TEST_PROCESSORS=8
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ matrix:
- rvm: 2.5.1
env:
- BEAKER_PUPPET_COLLECTION=puppet5
- BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
- BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
Expand All @@ -48,7 +48,7 @@ matrix:
- rvm: 2.5.1
env:
- BEAKER_PUPPET_COLLECTION=puppet6
- BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
- BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
Expand Down
3 changes: 1 addition & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,12 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"9"
"10"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"16.04",
"18.04"
]
},
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/foreman_proxy__plugin__ansible_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe 'foreman_proxy::plugin::ansible' do

['redhat-7-x86_64', 'debian-9-x86_64'].each do |os|
['redhat-7-x86_64', 'debian-10-x86_64'].each do |os|
context "on #{os}" do
let :facts do
on_supported_os[os]
Expand All @@ -16,7 +16,7 @@
it { should contain_foreman_proxy__plugin('dynflow') }

case os
when 'debian-9-x86_64'
when 'debian-10-x86_64'
it 'should include ansible-runner upstream repo' do
should contain_apt__source('ansible-runner')
.with_location('https://releases.ansible.com/ansible-runner/deb')
Expand Down Expand Up @@ -78,7 +78,7 @@
it { should contain_foreman_proxy__plugin('dynflow') }

case os
when 'debian-9-x86_64'
when 'debian-10-x86_64'
it { should_not contain_apt__source('ansible-runner') }
when 'redhat-7-x86_64'
it { should_not contain_yumrepo('ansible-runner') }
Expand Down Expand Up @@ -119,7 +119,7 @@
it { should_not contain_class('foreman_proxy::plugin::ansible::runner') }

case os
when 'debian-9-x86_64'
when 'debian-10-x86_64'
it { should_not contain_apt__source('ansible-runner') }
when 'redhat-7-x86_64'
it { should_not contain_yumrepo('ansible-runner') }
Expand Down