Merge branch 'test-registry-with-3-docker-clients' into 'master'

Add 3 latest docker versions on Container Registry test

See merge request gitlab-org/gitlab!75411

qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb

@@ -48,6 +48,7 @@ module QA
         project.remove_via_api!
       end
 
+      context "when tls is disabled" do
         where(:authentication_token_type, :token_name) do
           :personal_access_token | 'Personal Access Token'
           :project_deploy_token  | 'Deploy Token'
@@ -77,8 +78,12 @@ module QA
             end
           end
 
-        context "when tls is disabled" do
-          it "using a #{params[:token_name]}, pushes image and deletes tag", :registry do
+          where(:docker_client_version) do
+            %w[docker:18.09.9 docker:19.03.12 docker:20.10]
+          end
+
+          with_them do
+            it "pushes image and deletes tag", :registry do
               Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
                 Resource::Repository::Commit.fabricate_via_api! do |commit|
                   commit.project = project
@@ -88,10 +93,10 @@ module QA
                                       content:
                                           <<~YAML
                                             build:
-                                            image: docker:19.03.12
+                                              image: "#{docker_client_version}"
                                               stage: build
                                               services:
-                                            - name: docker:19.03.12-dind
+                                              - name: "#{docker_client_version}-dind"
                                                 command: ["--insecure-registry=gitlab.test:5050"]                                
                                               variables:
                                                 IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
@@ -123,9 +128,7 @@ module QA
 
                 registry.click_on_image(project.path_with_namespace)
                 expect(registry).to have_tag('master')
-
-              registry.click_delete
-              expect(registry).not_to have_tag('master')
+              end
             end
           end
         end