summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-01 21:16:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-01 21:16:08 +0000
commit70fe7ce74ba4a8430c88ec6e3f4c60475a69fe21 (patch)
tree1f4d4419e968dc5dd2ce0d75de9a94329d9a4035 /qa
parent08da8623a90545771482a17aa7761a139790823a (diff)
downloadgitlab-ce-70fe7ce74ba4a8430c88ec6e3f4c60475a69fe21.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa.rb3
-rw-r--r--qa/qa/scenario/test/integration/object_storage_gcs.rb13
-rw-r--r--qa/qa/scenario/test/integration/registry_with_cdn.rb14
3 files changed, 29 insertions, 1 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 96914055e8e..73bcb6de637 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -59,7 +59,8 @@ module QA
"jira_api" => "JiraAPI",
"registry_tls" => "RegistryTLS",
"jetbrains" => "JetBrains",
- "vscode" => "VSCode"
+ "vscode" => "VSCode",
+ "registry_with_cdn" => "RegistryWithCDN"
)
loader.setup
diff --git a/qa/qa/scenario/test/integration/object_storage_gcs.rb b/qa/qa/scenario/test/integration/object_storage_gcs.rb
new file mode 100644
index 00000000000..81e56c9316f
--- /dev/null
+++ b/qa/qa/scenario/test/integration/object_storage_gcs.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module QA
+ module Scenario
+ module Test
+ module Integration
+ class ObjectStorageGcs < Test::Instance::All
+ tags :object_storage
+ end
+ end
+ end
+ end
+end
diff --git a/qa/qa/scenario/test/integration/registry_with_cdn.rb b/qa/qa/scenario/test/integration/registry_with_cdn.rb
new file mode 100644
index 00000000000..87114d3c203
--- /dev/null
+++ b/qa/qa/scenario/test/integration/registry_with_cdn.rb
@@ -0,0 +1,14 @@
+# rubocop:todo Naming/FileName
+# frozen_string_literal: true
+
+module QA
+ module Scenario
+ module Test
+ module Integration
+ class RegistryWithCDN < Test::Instance::All
+ tags :registry
+ end
+ end
+ end
+ end
+end