Drop Debian 9 and Ubuntu 16.04, add Debian 10

theforeman · Nov 30, 2019 · cd99718 · cd99718
1 parent 6c37115
commit cd99718
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -2,7 +2,7 @@
 .travis.yml:
   beaker_sets:
     - centos7-64
-    - debian9-64
+    - debian10-64
   env:
     global:
       - PARALLEL_TEST_PROCESSORS=8

diff --git a/.travis.yml b/.travis.yml
@@ -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
@@ -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

diff --git a/metadata.json b/metadata.json
@@ -79,13 +79,12 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04"
       ]
     },

diff --git a/spec/classes/foreman_proxy__plugin__ansible_spec.rb b/spec/classes/foreman_proxy__plugin__ansible_spec.rb
@@ -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]
@@ -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')
@@ -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') }
@@ -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') }