Add latest changes from gitlab-org/gitlab@master

6 files changed, 59 insertions, 6 deletions

diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
index 7520def5bda..5e734997df8 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
@@ -15,7 +15,8 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_agents_via_ci_access
-performance_indicator_type: []
+performance_indicator_type:
+- smau
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20230809084619_connected_agents.yml b/config/metrics/counts_all/20230809084619_connected_agents.yml
index 93d75329243..57a5dc2e253 100644
--- a/config/metrics/counts_all/20230809084619_connected_agents.yml
+++ b/config/metrics/counts_all/20230809084619_connected_agents.yml
@@ -12,8 +12,7 @@ time_frame: all
 data_source: database
 data_category: optional
 instrumentation_class: CountConnectedAgentsMetric
-performance_indicator_type:
-- smau
+performance_indicator_type: []
 distribution:
 - ce
 - ee
diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb
index c2c1f6e4b79..a1ad3a50be7 100644
--- a/qa/qa/page/project/job/show.rb
+++ b/qa/qa/page/project/job/show.rb
@@ -72,8 +72,11 @@ module QA
             has_element?('artifacts-locked-message-content')
           end
 
-          def has_unlocked_artifact?
-            has_element?('artifacts-unlocked-message-content')
+          # Artifact unlock is async and depends on queue size on target env
+          def has_unlocked_artifact?(wait: 120)
+            wait_until(reload: true, max_duration: wait, sleep_interval: 1) do
+              has_element?('artifacts-unlocked-message-content')
+            end
           end
 
           def go_to_pipeline
diff --git a/qa/qa/page/project/web_ide/vscode.rb b/qa/qa/page/project/web_ide/vscode.rb
index 8f257e95f3e..50bb880023d 100644
--- a/qa/qa/page/project/web_ide/vscode.rb
+++ b/qa/qa/page/project/web_ide/vscode.rb
@@ -20,6 +20,18 @@ module QA
             page.find('.explorer-folders-view', visible: true).right_click
           end
 
+          def open_file_from_explorer(file_name)
+            click_element("div[aria-label='#{file_name}']")
+          end
+
+          def click_inside_editor_frame
+            click_element('.monaco-editor')
+          end
+
+          def within_file_editor(&block)
+            within_element('.monaco-editor', &block)
+          end
+
           def has_new_folder_menu_item?
             page.has_css?('[aria-label="New Folder..."]', visible: true)
           end
@@ -180,6 +192,28 @@ module QA
               end
             end
           end
+
+          def add_file_content(prompt_data)
+            click_inside_editor_frame
+            within_file_editor do
+              send_keys(:enter, :enter, prompt_data)
+            end
+          end
+
+          def verify_prompt_appears_and_accept(pattern)
+            within_file_editor do
+              Support::Waiter.wait_until(max_duration: 30) do
+                page.text.match?(pattern)
+              end
+              send_keys(:tab)
+            end
+          end
+
+          def validate_prompt(pattern)
+            within_file_editor do
+              page.text.match?(pattern)
+            end
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/api/5_package/container_registry/saas/container_registry_spec.rb b/qa/qa/specs/features/api/5_package/container_registry/saas/container_registry_spec.rb
index 446790d84e1..b9ff12b6dd7 100644
--- a/qa/qa/specs/features/api/5_package/container_registry/saas/container_registry_spec.rb
+++ b/qa/qa/specs/features/api/5_package/container_registry/saas/container_registry_spec.rb
@@ -7,6 +7,7 @@ module QA
     product_group: :container_registry do
     include Support::API
     include Support::Helpers::MaskToken
+    include Support::Data::Image
 
     describe 'SaaS Container Registry API' do
       let(:api_client) { Runtime::API::Client.new(:gitlab) }
@@ -55,7 +56,7 @@ module QA
             - docker pull $IMAGE_TAG
 
         test:
-          image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest
+          image: #{ci_test_image}
           stage: test
           script:
             - 'id=$(curl --header "PRIVATE-TOKEN: #{masked_token}" "https://${CI_SERVER_HOST}/api/v4/projects/#{project.id}/registry/repositories" | jq ".[0].id")'
diff --git a/qa/qa/support/data/image.rb b/qa/qa/support/data/image.rb
new file mode 100644
index 00000000000..a0af34ce145
--- /dev/null
+++ b/qa/qa/support/data/image.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module QA
+  module Support
+    module Data
+      module Image
+        def ci_test_image
+          'registry.gitlab.com/gitlab-ci-utils/curl-jq:latest'
+        end
+      end
+    end
+  end
+end
+
+QA::Support::Data::Image.prepend_mod_with('Support::Data::Image', namespace: QA)