Add newer OSes and Puppet 7 to test matrix

voxpupuli · Apr 16, 2021 · 174da41 · 174da41
1 parent 0b202d8
commit 174da41
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ RUN bundle install --without system_tests development release --path=${BUNDLE_PA
 COPY . .
 
 RUN bundle install
-RUN bundle exec rake release_checks
+RUN bundle exec ${CMD}
 
 # Container should not saved
 RUN exit 1
diff --git a/metadata.json b/metadata.json
@@ -24,26 +24,26 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.8 < 7.0.0"
+      "version_requirement": ">= 5.5.8 < 8.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7", "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7", "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7"
+        "7", "8"
       ]
     },
     {
@@ -55,7 +55,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04"
+        "18.04", "20.04"
       ]
     }
   ]

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -2,11 +2,11 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 8.0.0') if fact_on(host, 'os.family') == 'Debian'
-  install_module_from_forge_on(host, 'puppetlabs-java', '>= 2.1.0 < 7.0.0')
-  install_module_from_forge_on(host, 'puppetlabs-java_ks', '>= 1.6.0 < 4.0.0')
-  install_module_from_forge_on(host, 'puppetlabs-mysql', '>= 4.0.1 < 11.0.0')
-  install_module_from_forge_on(host, 'puppetlabs-postgresql', '>= 5.1.0 < 7.0.0')
+  install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0') if fact_on(host, 'os.family') == 'Debian'
+  install_module_from_forge_on(host, 'puppetlabs-java', '>= 2.1.0 < 8.0.0')
+  install_module_from_forge_on(host, 'puppetlabs-java_ks', '>= 1.6.0 < 5.0.0')
+  install_module_from_forge_on(host, 'puppetlabs-mysql', '>= 4.0.1 < 12.0.0')
+  install_module_from_forge_on(host, 'puppetlabs-postgresql', '>= 5.1.0 < 8.0.0')
 end
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }