Tag container images with CI_COMMIT_REF_SLUG

- containers built in trigger builds are now
  tagged additionally with CI_COMMIT_REF_SLUG to
  enable local testing

Signed-off-by: Balasankar "Balu" C <[email protected]>

Author: balasankarc

lib/gitlab/build/info/ci.rb

@@ -34,6 +34,10 @@ def api_v4_url
           Gitlab::Util.get_env('CI_API_V4_URL')
         end
 
+        def commit_ref_slug
+          Gitlab::Util.get_env('CI_COMMIT_REF_SLUG')
+        end
+
         def artifact_url(job_name, file_path)
           client = Gitlab::APIClient.new
           target_job_id = client.get_job_id(job_name)

lib/gitlab/tasks/docker_tasks.rake

@@ -1,6 +1,7 @@
 require 'docker'
 require_relative '../docker_operations'
 require_relative '../build/info'
+require_relative '../build/info/ci'
 require_relative '../build/check'
 require_relative '../build/gitlab_image'
 require_relative "../util.rb"
@@ -61,6 +62,10 @@ namespace :docker do
     task :triggered do
       Gitlab::Util.section('docker:push:triggered') 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
   end

spec/lib/gitlab/tasks/docker_tasks_spec.rb

@@ -90,11 +90,13 @@
     end
 
     it 'pushes triggered images correctly' do
+      allow(ENV).to receive(:[]).with('CI_COMMIT_REF_SLUG').and_return('foo-bar')
       allow(ENV).to receive(:[]).with('CI_REGISTRY_IMAGE').and_return('registry.gitlab.com/gitlab-org/omnibus-gitlab')
       allow(ENV).to receive(:[]).with("IMAGE_TAG").and_return("omnibus-12345")
       allow(Build::Info::Docker).to receive(:tag).and_call_original
 
       expect(dummy_image).to receive(:push).with(dummy_creds, repo_tag: 'registry.gitlab.com/gitlab-org/omnibus-gitlab/gitlab-ce:omnibus-12345')
+      expect(dummy_image).to receive(:push).with(dummy_creds, repo_tag: 'registry.gitlab.com/gitlab-org/omnibus-gitlab/gitlab-ce:foo-bar')
       Rake::Task['docker:push:triggered'].invoke
     end
   end