From d90675c92fa400c4b1f104e1eaa22609495fcd0b Mon Sep 17 00:00:00 2001 From: Hugo Haakseth Date: Fri, 26 Apr 2024 13:31:46 +0200 Subject: [PATCH] Remove unsupported mongodb 4.4 from test matrix --- .github/workflows/ci.yml | 2 +- .sync.yml | 2 +- REFERENCE.md | 4 ++-- manifests/globals.pp | 4 ++-- spec/support/acceptance/supported_version.rb | 2 +- spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c4d89c1d..c7c817623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ jobs: with: pidfile_workaround: 'false' beaker_hosts: 'host1:shard.ma;host2:slave,router.a' - beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0' + beaker_facter: 'mongodb_repo_version:MongoDB:5.0,6.0,7.0' diff --git a/.sync.yml b/.sync.yml index 35d767165..7ea3b71b7 100644 --- a/.sync.yml +++ b/.sync.yml @@ -4,4 +4,4 @@ appveyor.yml: .github/workflows/ci.yml: with: beaker_hosts: 'host1:shard.ma;host2:slave,router.a' - beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0' + beaker_facter: 'mongodb_repo_version:MongoDB:5.0,6.0,7.0' diff --git a/REFERENCE.md b/REFERENCE.md index aacb11844..246572879 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -87,7 +87,7 @@ Class for setting cross-class global overrides. class {'mongodb::globals': manage_package_repo => true, - repo_version => '4.4', + repo_version => '6.0', } -> class {'mongodb::client': } -> class {'mongodb::server': } @@ -99,7 +99,7 @@ class {'mongodb::globals': class {'mongodb::globals': manage_package_repo => true, - repo_version => '4.4', + repo_version => '6.0', use_enterprise_repo => true, } -> class {'mongodb::client': } diff --git a/manifests/globals.pp b/manifests/globals.pp index 5ffbdb91a..e1e182d82 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -4,7 +4,7 @@ # # class {'mongodb::globals': # manage_package_repo => true, -# repo_version => '4.4', +# repo_version => '6.0', # } # -> class {'mongodb::client': } # -> class {'mongodb::server': } @@ -13,7 +13,7 @@ # # class {'mongodb::globals': # manage_package_repo => true, -# repo_version => '4.4', +# repo_version => '6.0', # use_enterprise_repo => true, # } # -> class {'mongodb::client': } diff --git a/spec/support/acceptance/supported_version.rb b/spec/support/acceptance/supported_version.rb index 51a18579b..6344408a9 100644 --- a/spec/support/acceptance/supported_version.rb +++ b/spec/support/acceptance/supported_version.rb @@ -3,7 +3,7 @@ def supported_version?(platform, version) return true if version.nil? - supported_versions = %w[4.4 5.0 6.0 7.0] + supported_versions = %w[5.0 6.0 7.0] return false unless supported_versions.include?(version) supported_versions.reject! do |v| diff --git a/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb b/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb index 7f74adf5d..22ed42c8f 100644 --- a/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb +++ b/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb @@ -60,7 +60,7 @@ mongodconffile = tmp.path allow(provider.class).to receive(:mongod_conf_file).and_return(mongodconffile) allow(provider.class).to receive(:mongo_eval).with('EJSON.stringify(db.system.users.find().toArray())').and_return(raw_users) - allow(provider.class).to receive(:mongo_version).and_return('4.4.0') + allow(provider.class).to receive(:mongo_version).and_return('7.0.0') allow(provider.class).to receive(:db_ismaster).and_return(true) end