Merge pull request #728 from StatensPensjonskasse/add-mongodb-6.0-and…

…-7.0-to-acceptance-testing Add mongodb 6.0 and 7.0 to acceptance testing
voxpupuli · Apr 9, 2024 · feaddb1 · feaddb1
2 parents cca31d5 + d126569
commit feaddb1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,4 +20,4 @@ jobs:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
-      beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0'
+      beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0'
diff --git a/.sync.yml b/.sync.yml
@@ -2,4 +2,4 @@
 appveyor.yml:
   delete: true
 .github/workflows/ci.yml:
-  beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0'
+  beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0'
diff --git a/spec/support/acceptance/supported_version.rb b/spec/support/acceptance/supported_version.rb
@@ -3,11 +3,15 @@
 def supported_version?(platform, version)
   return true if version.nil?
 
-  supported_versions = %w[4.4 5.0]
+  supported_versions = %w[4.4 5.0 6.0 7.0]
   return false unless supported_versions.include?(version)
 
   supported_versions.reject! do |v|
-    v < '5.0' && platform.start_with?('debian-11')
+    (v < '6.0' && platform.start_with?('el-9')) ||
+      (v > '6.0' && platform.start_with?('debian-10')) ||
+      (v < '5.0' && platform.start_with?('debian-11')) ||
+      (v < '7.0' && platform.start_with?('debian-12')) ||
+      (v < '6.0' && platform.start_with?('ubuntu-22'))
   end
 
   supported_versions.include?(version)