Commit 78fafdb0 authored by Stan Hu's avatar Stan Hu

Merge branch '4762-remove-geo-git-version-check' into 'master'

Resolve "Remove geo-specific git version check"

Closes #4762

See merge request gitlab-org/gitlab-ee!4331
parents be7b5bdc b1b64fec
module SystemCheck
module Geo
class GitVersionCheck < ::SystemCheck::App::GitVersionCheck
set_name -> { "Git version >= #{self.required_version} ?" }
set_check_pass -> { "yes (#{self.current_version})" }
def self.required_version
@required_version ||= Gitlab::VersionInfo.new(2, 9, 5)
end
end
end
end
......@@ -451,7 +451,6 @@ namespace :gitlab do
checks = [
SystemCheck::Geo::LicenseCheck,
SystemCheck::Geo::EnabledCheck,
SystemCheck::Geo::GitVersionCheck,
SystemCheck::Geo::GeoDatabaseConfiguredCheck,
SystemCheck::Geo::DatabaseReplicationCheck,
SystemCheck::Geo::HttpConnectionCheck,
......
require 'spec_helper'
describe SystemCheck::Geo::GitVersionCheck do
describe '#check?' do
subject { described_class.new.check? }
where(:git_version, :result) do
[
['2.8.99', false],
['2.9.0', false],
['2.9.4', false],
['2.9.5', true],
['2.9.55', true],
['10.0.0', true]
]
end
with_them do
before do
stub_git_version(git_version)
end
it { is_expected.to eq(result) }
end
end
def stub_git_version(version)
allow(described_class).to receive(:current_version) { Gitlab::VersionInfo.parse(version) }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment