Skip to content

Commit

Permalink
Merge pull request #758 from StatensPensjonskasse/remove-4.4-from-tes…
Browse files Browse the repository at this point in the history
…t-matrix

Remove unsupported mongodb 4.4 from test matrix
  • Loading branch information
h-haaks authored Apr 28, 2024
2 parents 1298b11 + d90675c commit 603e7c9
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 2 additions & 2 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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': }
Expand All @@ -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': }
Expand Down
4 changes: 2 additions & 2 deletions manifests/globals.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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': }
Expand All @@ -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': }
Expand Down
2 changes: 1 addition & 1 deletion spec/support/acceptance/supported_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 603e7c9

Please sign in to comment.