Add latest changes from gitlab-org/gitlab@master

3 files changed, 28 insertions, 6 deletions

diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb
index 07dea3449f1..d673efd1970 100644
--- a/qa/qa/page/project/job/show.rb
+++ b/qa/qa/page/project/job/show.rb
@@ -13,6 +13,10 @@ module QA::Page
         element :pipeline_path
       end
 
+      view 'app/assets/javascripts/jobs/components/sidebar.vue' do
+        element :retry_button
+      end
+
       def successful?(timeout: 60)
         raise "Timed out waiting for the build trace to load" unless loaded?
         raise "Timed out waiting for the status to be a valid completed state" unless completed?(timeout: timeout)
@@ -33,6 +37,10 @@ module QA::Page
         result
       end
 
+      def retry!
+        click_element :retry_button
+      end
+
       private
 
       def loaded?(wait: 60)
diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb
index 64a182e5b3a..2bb285d6086 100644
--- a/qa/qa/page/project/settings/ci_variables.rb
+++ b/qa/qa/page/project/settings/ci_variables.rb
@@ -52,6 +52,14 @@ module QA
             end
           end
 
+          def remove_variable(location: :first)
+            within('.ci-variable-row-body', match: location) do
+              find('button.ci-variable-row-remove-button').click
+            end
+
+            save_variables
+          end
+
           private
 
           def toggle_masked(masked_node, masked)
diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
index 0ca49bd080b..19cd7d123c9 100644
--- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
@@ -46,12 +46,7 @@ module QA
 
           deploy_key_name = "DEPLOY_KEY_#{key.name}_#{key.bits}"
 
-          Resource::CiVariable.fabricate_via_browser_ui! do |resource|
-            resource.project = @project
-            resource.key = deploy_key_name
-            resource.value = key.private_key
-            resource.masked = false
-          end
+          make_ci_variable(deploy_key_name, key)
 
           gitlab_ci = <<~YAML
           cat-config:
@@ -90,6 +85,17 @@ module QA
             expect(job.output).to include(sha1sum)
           end
         end
+
+        private
+
+        def make_ci_variable(key_name, key)
+          Resource::CiVariable.fabricate_via_api! do |resource|
+            resource.project = @project
+            resource.key = key_name
+            resource.value = key.private_key
+            resource.masked = false
+          end
+        end
       end
     end
   end