Merge branch 'tag-stable-staging-docker-images' into 'master'

Tag docker images from staging builds with CI_COMMIT_REF_SLUG also

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Nailia Iskhakova <[email protected]>

Author: balasankarc

lib/gitlab/tasks/docker_tasks.rake

@@ -28,6 +28,10 @@ namespace :docker do
     task :staging do
       Gitlab::Util.section('docker:push:staging') do
         Build::GitlabImage.tag_and_push_to_gitlab_registry(Build::Info::Docker.tag)
+
+        # Also tag with CI_COMMIT_REF_SLUG so that manual testing using Docker
+        # can use the same image name/tag.
+        Build::GitlabImage.tag_and_push_to_gitlab_registry(Build::Info::CI.commit_ref_slug)
       end
     end
 

spec/lib/gitlab/tasks/docker_tasks_spec.rb

@@ -55,6 +55,7 @@
 
       allow(ENV).to receive(:[]).and_call_original
       allow(ENV).to receive(:[]).with('CI_REGISTRY_IMAGE').and_return('dev.gitlab.org:5005/gitlab/omnibus-gitlab')
+      allow(ENV).to receive(:[]).with('CI_COMMIT_REF_SLUG').and_return('foo-bar')
       allow(Build::Info::Package).to receive(:name).and_return('gitlab-ce')
       allow(Build::Info::Docker).to receive(:tag).and_return('9.0.0')
       allow(DockerOperations).to receive(:authenticate).and_return(true)
@@ -65,6 +66,7 @@
 
     it 'pushes to staging correctly' do
       expect(dummy_image).to receive(:push).with(dummy_creds, repo_tag: 'dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ce:9.0.0')
+      expect(dummy_image).to receive(:push).with(dummy_creds, repo_tag: 'dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ce:foo-bar')
       Rake::Task['docker:push:staging'].invoke
     end