Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

qa/qa/service/docker_run/container_registry_utils.rb

@@ -4,8 +4,13 @@ module QA
   module Service
     module DockerRun
       class ContainerRegistryUtils < Base
-        def tag_image(current_tag, new_tag)
-          run_docker_command("tag #{current_tag} #{new_tag}")
+        def initialize(image:)
+          @image = image
+          super()
+        end
+
+        def tag_image(new_tag)
+          run_docker_command("tag #{@image} #{new_tag}")
         end
 
         def push_image(tag)

qa/qa/specs/features/ee/browser_ui/13_secure/cvs_container_registry_spec.rb

@@ -22,7 +22,7 @@ module QA
       end
 
       let(:new_image_tag) { "#{registry_host}/#{project.full_path}:latest" }
-      let(:docker_utils) { QA::Service::DockerRun::ContainerRegistryUtils.new }
+      let(:docker_utils) { QA::Service::DockerRun::ContainerRegistryUtils.new(image: image_tag) }
 
       before do
         Runtime::Feature.enable(:cvs_for_container_scanning, project: project)
@@ -50,10 +50,11 @@ def configure_security_scanning
       end
 
       def push_container_image
+        docker_utils.pull
         docker_utils.login(registry_host,
           user: Runtime::Env.user_username,
           password: registry_password_token)
-        docker_utils.tag_image(image_tag, new_image_tag)
+        docker_utils.tag_image(new_image_tag)
         docker_utils.push_image(new_image_tag)
       end