Skip to content

Commit fd2e273

Browse files
committed
Split QA related information to own class
Move the following method: * `Build::Info.qa_image` => `Build::Info::QA.image` Signed-off-by: Balasankar "Balu" C <[email protected]>
1 parent 429bdb1 commit fd2e273

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

lib/gitlab/build/facts.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def common_vars
7575
def qa_trigger_vars
7676
%W[
7777
QA_RELEASE=#{Build::GitlabImage.gitlab_registry_image_address(tag: Build::Info::Docker.tag)}
78-
QA_IMAGE=#{Build::Info.qa_image}
78+
QA_IMAGE=#{Build::Info::QA.image}
7979
QA_TESTS=#{Gitlab::Util.get_env('QA_TESTS')}
8080
ALLURE_JOB_NAME=#{allure_job_name}-#{Build::Info::Package.edition}
8181
GITLAB_SEMVER_VERSION=#{Build::Info::Git.latest_stable_tag.tr('+', '-')}

lib/gitlab/build/info.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ class Info
1515
}.freeze
1616

1717
class << self
18-
def qa_image
19-
Gitlab::Util.get_env('QA_IMAGE') || "#{Gitlab::Util.get_env('CI_REGISTRY')}/#{Build::Info::Components::GitLabRails.project_path}/#{Build::Info::Package.name}-qa:#{Build::Info::Components::GitLabRails.ref(prepend_version: false)}"
20-
end
21-
2218
def gcp_release_bucket
2319
# All tagged builds are pushed to the release bucket
2420
# whereas regular branch builds use a separate one

lib/gitlab/build/info/qa.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module Build
2+
class Info
3+
class QA
4+
class << self
5+
def image
6+
Gitlab::Util.get_env('QA_IMAGE') || "#{Gitlab::Util.get_env('CI_REGISTRY')}/#{Build::Info::Components::GitLabRails.project_path}/#{Build::Info::Package.name}-qa:#{Build::Info::Components::GitLabRails.ref(prepend_version: false)}"
7+
end
8+
end
9+
end
10+
end
11+
end

lib/gitlab/build/qa_image.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require_relative 'image'
2+
require_relative 'info/qa'
23
require_relative 'gitlab_image'
34
require_relative '../skopeo_helper'
45

@@ -15,7 +16,7 @@ def self.gitlab_registry_image_name
1516
end
1617

1718
def self.copy_image_to_dockerhub(final_tag)
18-
source = Build::Info.qa_image
19+
source = Build::Info::QA.image
1920
target = "#{dockerhub_image_name}:#{final_tag}"
2021

2122
SkopeoHelper.login('gitlab-ci-token', Gitlab::Util.get_env('CI_JOB_TOKEN'), Gitlab::Util.get_env('CI_REGISTRY'))

spec/lib/gitlab/build/qa_image_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
describe '.copy_image_to_dockerhub' do
3232
before do
33-
allow(Build::Info).to receive(:qa_image).and_return('registry.gitlab.com/gitlab-org/gitlab/gitlab-ce-qa:1234567890')
33+
allow(Build::Info::QA).to receive(:image).and_return('registry.gitlab.com/gitlab-org/gitlab/gitlab-ce-qa:1234567890')
3434

3535
allow(SkopeoHelper).to receive(:login).and_return(true)
3636
allow(SkopeoHelper).to receive(:copy_image).and_return(true)

0 commit comments

Comments
 (0)