Merge branch 'tag-qa-image-with-rails-ref' into 'master'

Tag QA image with auto-deploy rails ref tag format

Closes #7068

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6307

Merged-by: Robert Marshall <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Co-authored-by: Balasankar "Balu" C <[email protected]>

Author: Robert Marshall

lib/gitlab/tasks/qa.rake

@@ -30,8 +30,19 @@ namespace :qa do
     desc "Push unstable or auto-deploy version of gitlab-{ce,ee}-qa to the GitLab registry"
     task :staging do
       Gitlab::Util.section('qa:push:staging') do
-        tag = Build::Check.is_auto_deploy? ? Build::Info.major_minor_version_and_rails_ref : Build::Info.gitlab_version
-        Build::QAImage.tag_and_push_to_gitlab_registry(tag)
+        if Build::Check.is_auto_deploy?
+          # Tag using both major.minor-railsref tag and just railsref tag.
+          # Temporary until gitlab-qa is changed to detect QA image tag from just railsref.
+          # https://gitlab.com/gitlab-org/gitlab-qa/-/issues/687
+          major_minor_version_and_rails_ref = Build::Info.major_minor_version_and_rails_ref
+          rails_ref = major_minor_version_and_rails_ref.match(/^(?<major>\d+)\.(?<minor>\d+)-(?<railsref>\w+)$/)['railsref']
+
+          Build::QAImage.tag_and_push_to_gitlab_registry(major_minor_version_and_rails_ref)
+          Build::QAImage.tag_and_push_to_gitlab_registry(rails_ref)
+        else
+          Build::QAImage.tag_and_push_to_gitlab_registry(Build::Info.gitlab_version)
+        end
+
         Build::QAImage.tag_and_push_to_gitlab_registry(Build::Info.commit_sha)
       end
     end

spec/lib/gitlab/tasks/qa_spec.rb

@@ -107,6 +107,7 @@
         allow(Build::Info).to receive(:current_git_tag).and_return('12.0.12345+5159f2949cb.59c9fa631')
 
         expect(Build::QAImage).to receive(:tag_and_push_to_gitlab_registry).with('12.0-5159f2949cb')
+        expect(Build::QAImage).to receive(:tag_and_push_to_gitlab_registry).with('5159f2949cb')
         expect(Build::QAImage).to receive(:tag_and_push_to_gitlab_registry).with(commit_sha)
 
         Rake::Task['qa:push:staging'].invoke