# HG changeset patch # User Balasankar 'Balu' C <balasankar@gitlab.com> # Date 1669229343 0 # Wed Nov 23 18:49:03 2022 +0000 # Node ID 4f1fc82374bcc46ad97cc74dc89eaf82efae51e6 # Parent cb44cee6e0e8d8b47d8ddbcb3db3ff5070ddb1bd Use correct target for building QA image Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com> diff --git a/lib/gitlab/tasks/qa.rake b/lib/gitlab/tasks/qa.rake --- a/lib/gitlab/tasks/qa.rake +++ b/lib/gitlab/tasks/qa.rake @@ -12,7 +12,8 @@ namespace :qa do desc "Build QA Docker image" task :build do - qa_build_target = Gitlab::Util.get_env('QA_BUILD_TARGET') || 'qa' + edition_build_target = Build::Check.is_ee? ? 'ee' : 'foss' + qa_build_target = Gitlab::Util.get_env('QA_BUILD_TARGET') || edition_build_target Gitlab::Util.section('qa:build') do DockerOperations.build( Build::QA.get_gitlab_repo, diff --git a/spec/lib/gitlab/tasks/qa_spec.rb b/spec/lib/gitlab/tasks/qa_spec.rb --- a/spec/lib/gitlab/tasks/qa_spec.rb +++ b/spec/lib/gitlab/tasks/qa_spec.rb @@ -27,7 +27,7 @@ repo_path, 'dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ce-qa', 'latest', - buildargs: "{\"QA_BUILD_TARGET\":\"qa\"}", + buildargs: "{\"QA_BUILD_TARGET\":\"foss\"}", dockerfile: "qa/Dockerfile" )