Merge pull request #716 from StatensPensjonskasse/beakertest-different-repo-versions

bastelfreak · web-flow · commit 04e505a9e2d5 · 2024-03-24T10:48:23.000+01:00
Test supported repo versions with gha
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,3 +19,5 @@ jobs:
   puppet:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    with:
+      beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0'
diff --git a/.sync.yml b/.sync.yml
@@ -1,3 +1,5 @@
 ---
 appveyor.yml:
   delete: true
+.github/workflows/ci.yml:
+  beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0'
diff --git a/spec/acceptance/database_spec.rb b/spec/acceptance/database_spec.rb
@@ -2,12 +2,18 @@
 
 require 'spec_helper_acceptance'
 
-describe 'mongodb_database' do
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+describe 'mongodb_database', if: supported_version?(default[:platform], repo_version) do
   describe 'creating a database' do
     context 'with default port' do
       it 'compiles with no errors' do
         pp = <<-EOS
-          class { 'mongodb::server': }
+          class { 'mongodb::globals':
+            #{repo_ver_param}
+          }
+          -> class { 'mongodb::server': }
           -> class { 'mongodb::client': }
           -> mongodb::db { 'testdb1':
             user     => 'testuser',
@@ -31,7 +37,10 @@ class { 'mongodb::server': }
     context 'with custom port' do
       it 'works with no errors' do
         pp = <<-EOS
-          class { 'mongodb::server':
+          class { 'mongodb::globals':
+            #{repo_ver_param}
+          }
+          -> class { 'mongodb::server':
             port => 27018,
           }
           -> class { 'mongodb::client': }
diff --git a/spec/acceptance/mongos_spec.rb b/spec/acceptance/mongos_spec.rb
@@ -2,14 +2,20 @@
 
 require 'spec_helper_acceptance'
 
-describe 'mongodb::mongos class' do
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+describe 'mongodb::mongos class', if: supported_version?(default[:platform], repo_version) do
   package_name = 'mongodb-org-server'
   config_file = '/etc/mongos.conf'
 
   describe 'installation' do
     it 'works with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server':
+          class { 'mongodb::globals':
+            #{repo_ver_param}
+          }
+          -> class { 'mongodb::server':
           configsvr => true,
           replset   => 'test',
           replset_members => ['127.0.0.1:27019'],
diff --git a/spec/acceptance/replset_spec.rb b/spec/acceptance/replset_spec.rb
@@ -2,14 +2,19 @@
 
 require 'spec_helper_acceptance'
 
-if hosts.length > 1
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+if hosts.length > 1 && supported_version?(default[:platform], repo_version)
   describe 'mongodb_replset resource' do
     after :all do
       # Have to drop the DB to disable replsets for further testing
       on hosts, %{mongo local --verbose --eval 'db.dropDatabase()'}
 
       pp = <<-EOS
-        class { 'mongodb::globals': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
         -> class { 'mongodb::server':
           ensure         => absent,
           package_ensure => absent,
@@ -27,7 +32,9 @@ class { 'mongodb::client':
 
     it 'configures mongo on both nodes' do
       pp = <<-EOS
-        class { 'mongodb::globals': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
         -> class { 'mongodb::server':
           bind_ip => '0.0.0.0',
           replset => 'test',
@@ -79,7 +86,9 @@ class { 'mongodb::client': }
       on hosts, %{mongo local --verbose --eval 'db.dropDatabase()'}
 
       pp = <<-EOS
-        class { 'mongodb::globals': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
         -> class { 'mongodb::server':
           ensure => absent,
           package_ensure => absent,
@@ -97,18 +106,17 @@ class { 'mongodb::client':
 
     it 'configures mongo on both nodes' do
       pp = <<~EOS
-                class { 'mongodb::globals':
-                  version             => '2.6.9-1',
-                  manage_package_repo => true
-                } ->
-                class { 'mongodb::server':
-                  admin_username => 'admin',
-                  admin_password => 'password',
-                  auth           => true,
-                  bind_ip        => '0.0.0.0',
-                  replset        => 'test',
-                  keyfile        => '/var/lib/mongodb/mongodb-keyfile',
-                  key            => '+dxlTrury7xtD0FRqFf3YWGnKqWAtlyauuemxuYuyz9POPUuX1Uj3chGU8MFMHa7
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        } ->
+        class { 'mongodb::server':
+          admin_username => 'admin',
+          admin_password => 'password',
+          auth           => true,
+          bind_ip        => '0.0.0.0',
+          replset        => 'test',
+          keyfile        => '/var/lib/mongodb/mongodb-keyfile',
+          key            => '+dxlTrury7xtD0FRqFf3YWGnKqWAtlyauuemxuYuyz9POPUuX1Uj3chGU8MFMHa7
         UxASqex7NLMALQXHL+Th4T3dyb6kMZD7KiMcJObO4M+JLiX9drcTiifsDEgGMi7G
         vYn3pWSm5TTDrHJw7RNWfMHw3sHk0muGQcO+0dWv3sDJ6SiU8yOKRtYcTEA15GbP
         ReDZuHFy1T1qhk5NIt6pTtPGsZKSm2wAWIOa2f2IXvpeQHhjxP8aDFb3fQaCAqOD
@@ -124,11 +132,10 @@ class { 'mongodb::server':
         YG/QX0BmltAni8owgymFuyJgvr/gaRX4WHbKFD+9nKpqJ3ocuVNuCDsxDqLsJEME
         nc1ohyB0lNt8lHf1U00mtgDSV3fwo5LkwhRi6d+bDBTL/C6MZETMLdyCqDlTdUWG
         YXIsJ0gYcu9XG3mx10LbdPJvxSMg'
-
-                }
-                if $::osfamily == 'RedHat' {
-                  include mongodb::client
-                }
+        }
+        if $::osfamily == 'RedHat' {
+          include mongodb::client
+        }
       EOS
 
       apply_manifest_on(hosts.reverse, pp, catch_failures: true)
@@ -137,43 +144,11 @@ class { 'mongodb::server':
 
     it 'sets up the replset with puppet' do
       pp = <<~EOS
-                class { 'mongodb::globals':
-                  version             => '2.6.9-1',
-                  manage_package_repo => true
-                } ->
-                class { 'mongodb::server':
-                  create_admin   => true,
-                  admin_username => 'admin',
-                  admin_password => 'password',
-                  auth           => true,
-                  bind_ip        => '0.0.0.0',
-                  replset        => 'test',
-                  keyfile        => '/var/lib/mongodb/mongodb-keyfile',
-                  key            => '+dxlTrury7xtD0FRqFf3YWGnKqWAtlyauuemxuYuyz9POPUuX1Uj3chGU8MFMHa7
-        UxASqex7NLMALQXHL+Th4T3dyb6kMZD7KiMcJObO4M+JLiX9drcTiifsDEgGMi7G
-        vYn3pWSm5TTDrHJw7RNWfMHw3sHk0muGQcO+0dWv3sDJ6SiU8yOKRtYcTEA15GbP
-        ReDZuHFy1T1qhk5NIt6pTtPGsZKSm2wAWIOa2f2IXvpeQHhjxP8aDFb3fQaCAqOD
-        R7hrimqq0Nickfe8RLA89iPXyadr/YeNBB7w7rySatQBzwIbBUVGNNA5cxCkwyx9
-        E5of3xi7GL9xNxhQ8l0JEpofd4H0y0TOfFDIEjc7cOnYlKAHzBgog4OcFSILgUaF
-        kHuTMtv0pj+MMkW2HkeXETNII9XE1+JiZgHY08G7yFEJy87ttUoeKmpbI6spFz5U
-        4K0amj+N6SOwXaS8uwp6kCqay0ERJLnw+7dKNKZIZdGCrrBxcZ7wmR/wLYrxvHhZ
-        QpeXTxgD5ebwCR0cf3Xnb5ql5G/HHKZDq8LTFHwELNh23URGPY7K7uK+IF6jSEhq
-        V2H3HnWV9teuuJ5he9BB/pLnyfjft6KUUqE9HbaGlX0f3YBk/0T3S2ESN4jnfRTQ
-        ysAKvQ6NasXkzqXktu8X4fS5QNqrFyqKBZSWxttfJBKXnT0TxamCKLRx4AgQglYo
-        3KRoyfxXx6G+AjP1frDJxFAFEIgEFqRk/FFuT/y9LpU+3cXYX1Gt6wEatgmnBM3K
-        g+Bybk5qHv1b7M8Tv9/I/BRXcpLHeIkMICMY8sVPGmP8xzL1L3i0cws8p5h0zPBa
-        YG/QX0BmltAni8owgymFuyJgvr/gaRX4WHbKFD+9nKpqJ3ocuVNuCDsxDqLsJEME
-        nc1ohyB0lNt8lHf1U00mtgDSV3fwo5LkwhRi6d+bDBTL/C6MZETMLdyCqDlTdUWG
-        YXIsJ0gYcu9XG3mx10LbdPJvxSMg'
-                }
-                if $::osfamily == 'RedHat' {
-                  include mongodb::client
-                }
-                mongodb_replset { 'test':
-                  auth_enabled => true,
-                  members      => [#{hosts.map { |x| "'#{x}:27017'" }.join(',')}],
-                  before       => Mongodb_user['admin']
-                }
+        mongodb_replset { 'test':
+          auth_enabled => true,
+          members      => [#{hosts.map { |x| "'#{x}:27017'" }.join(',')}],
+          before       => Mongodb_user['admin']
+        }
       EOS
       apply_manifest_on(hosts_as('master'), pp, catch_failures: true)
       apply_manifest_on(hosts_as('master'), pp, catch_changes: true)
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -2,15 +2,21 @@
 
 require 'spec_helper_acceptance'
 
-describe 'mongodb::server class' do
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+describe 'mongodb::server class', if: supported_version?(default[:platform], repo_version) do
   config_file = '/etc/mongod.conf'
   service_name = 'mongod'
   package_name = 'mongodb-org-server'
 
   describe 'installation' do
     it 'works with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': }
         -> class { 'mongodb::client': }
       EOS
 
@@ -43,7 +49,10 @@ class { 'mongodb::server': }
   describe 'installation using custom port' do
     it 'change port to 27018' do
       pp = <<-EOS
-        class { 'mongodb::server':
+        class { 'mongodb::globals':
+        #{repo_ver_param}
+      }
+        -> class { 'mongodb::server':
           port => 27018,
         }
         -> class { 'mongodb::client': }
@@ -78,7 +87,10 @@ class { 'mongodb::server':
   describe 'installation using authentication' do
     it 'works with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server':
+        class { 'mongodb::globals':
+        #{repo_ver_param}
+        }
+        -> class { 'mongodb::server':
           auth           => true,
           create_admin   => false,
           handle_creds   => true,
@@ -88,7 +100,7 @@ class { 'mongodb::server':
           restart        => true,
           set_parameter  => ['enableLocalhostAuthBypass: true']
         }
-        class { 'mongodb::client': }
+        -> class { 'mongodb::client': }
 
         mongodb_user { "User admin on db admin":
           ensure        => present,
@@ -146,11 +158,11 @@ class { 'mongodb::client': }
     it 'uninstalls mongodb' do
       pp = <<-EOS
         class { 'mongodb::server':
-             ensure => absent,
-             package_ensure => absent,
-             service_ensure => stopped,
-             service_enable => false
-           }
+            ensure => absent,
+            package_ensure => absent,
+            service_ensure => stopped,
+            service_enable => false
+          }
         -> class { 'mongodb::client': ensure => absent, }
       EOS
       apply_manifest(pp, catch_failures: true)
diff --git a/spec/acceptance/sharding_spec.rb b/spec/acceptance/sharding_spec.rb
@@ -2,11 +2,16 @@
 
 require 'spec_helper_acceptance'
 
-if hosts.length > 1
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+if hosts.length > 1 && supported_version?(default[:platform], repo_version)
   describe 'mongodb_shard resource' do
     it 'configures the shard server' do
       pp = <<-EOS
-        class { 'mongodb::globals': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
         -> class { 'mongodb::server':
           bind_ip   => '0.0.0.0',
           replset   => 'foo',
@@ -26,7 +31,9 @@ class { 'mongodb::client': }
 
     it 'configures the router server' do
       pp = <<-EOS
-        class { 'mongodb::globals': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
         -> class { 'mongodb::server':
           bind_ip   => '0.0.0.0',
           configsvr => true,
diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
@@ -2,11 +2,17 @@
 
 require 'spec_helper_acceptance'
 
-describe 'mongodb_database' do
-  context 'with default port' do
+repo_version = ENV.fetch('BEAKER_FACTER_mongodb_repo_version', nil)
+repo_ver_param = "repo_version => '#{repo_version}'" if repo_version
+
+describe 'mongodb_user', if: supported_version?(default[:platform], repo_version) do
+  context 'with default server port' do
     it 'compiles with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': }
         -> class { 'mongodb::client': }
         -> mongodb_database { 'testdb': ensure => present }
         ->
@@ -29,7 +35,10 @@ class { 'mongodb::server': }
 
     it 'removes a user with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': }
         -> class { 'mongodb::client': }
         -> mongodb_database { 'testdb': ensure => present }
         ->
@@ -51,10 +60,13 @@ class { 'mongodb::server': }
     end
   end
 
-  context 'with custom port' do
+  context 'with custom server port' do
     it 'works with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': port => 27018 }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': port => 27018 }
         -> class { 'mongodb::client': }
         -> mongodb_database { 'testdb': ensure => present }
         ->
@@ -79,7 +91,10 @@ class { 'mongodb::server': port => 27018 }
   context 'with the basic roles syntax' do
     it 'compiles with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': }
         -> class { 'mongodb::client': }
         -> mongodb_database { 'testdb': ensure => present }
         ->
@@ -105,7 +120,10 @@ class { 'mongodb::server': }
   context 'with the new multidb role syntax' do
     it 'compiles with no errors' do
       pp = <<-EOS
-        class { 'mongodb::server': }
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::server': }
         -> class { 'mongodb::client': }
         -> mongodb_database { 'testdb': ensure => present }
         -> mongodb_database { 'testdb2': ensure => present }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
+require 'support/acceptance/supported_version'
 
 configure_beaker(modules: :metadata)
diff --git a/spec/support/acceptance/supported_version.rb b/spec/support/acceptance/supported_version.rb
