Skip to content
Snippets Groups Projects
Verified Commit fd17ffd5 authored by Stan Hu's avatar Stan Hu
Browse files

Use Gemfile.lock again for mailroom version

This reverts
!1592
since we are on Ruby 3, and
gitlab!116494 has been
merged.

Relates to gitlab-com/gl-infra/delivery#2231
parent 40a3572f
No related branches found
No related tags found
Loading
......@@ -103,10 +103,6 @@ module ReleaseTools
end
end
def self.ignore_versions
[]
end
def self.extract_id_from_remote(remote_key)
return unless const_defined?(:IDS)
......
......@@ -29,12 +29,6 @@ module ReleaseTools
}
end
# This is a workaround because we can't update the it based
# on the GitLab gemfile due to a bug, so it's ignored for now.
def self.ignore_versions
['MAILROOM_VERSION']
end
def self.default_branch
if Feature.enabled?(:switch_to_main_branch)
'main'
......
......@@ -173,9 +173,6 @@ module ReleaseTools
end
Project::GitlabEe.gems.each do |pattern, file|
# Ensure ci/variables.yml are always used for ignored versions
next if Project::GitlabEe.ignore_versions.include?(file)
components[file] = gemfile_parser.gem_version(pattern)
end
......
......@@ -256,39 +256,6 @@ describe ReleaseTools::PublicRelease::CNGImageRelease do
}
)
end
it 'respects MAILROOM_VERSION value' do
allow(release)
.to receive(:component_versions)
.and_return('FOO' => 'v1.0.0')
allow(release)
.to receive(:read_file)
.with(described_class::VARIABLES_FILE)
.and_return(YAML.dump('variables' => { 'MAILROOM_VERSION' => '1.2.3' }))
ce, ee = release.distribution_component_versions
expect(ce).to eq(
'variables' => {
'GITLAB_VERSION' => 'v42.0.0',
'GITLAB_REF_SLUG' => 'v42.0.0',
'GITLAB_ASSETS_TAG' => 'v42-0-0',
'FOO' => 'v1.0.0',
'MAILROOM_VERSION' => '1.2.3'
}
)
expect(ee).to eq(
'variables' => {
'GITLAB_VERSION' => 'v42.0.0-ee',
'GITLAB_REF_SLUG' => 'v42.0.0-ee',
'GITLAB_ASSETS_TAG' => 'v42-0-0-ee',
'FOO' => 'v1.0.0',
'MAILROOM_VERSION' => '1.2.3'
}
)
end
end
describe '#component_versions' do
......@@ -298,7 +265,8 @@ describe ReleaseTools::PublicRelease::CNGImageRelease do
'GITLAB_SHELL_VERSION' => 'v2.0.0',
'GITLAB_ELASTICSEARCH_INDEXER_VERSION' => 'v4.0.0',
'GITLAB_PAGES_VERSION' => 'v5.0.0',
'GITLAB_KAS_VERSION' => 'v6.0.0'
'GITLAB_KAS_VERSION' => 'v6.0.0',
'MAILROOM_VERSION' => '0.9.1'
}
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment