Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 40 insertions, 5 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
index 3da73c8fa72..107d72a9724 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
@@ -18,30 +18,34 @@ module QA
           file_name: '.gitignore',
           name: 'Android',
           api_path: 'gitignores',
-          api_key: 'Android'
+          api_key: 'Android',
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347659'
         },
         {
           file_name: '.gitlab-ci.yml',
           name: 'Julia',
           api_path: 'gitlab_ci_ymls',
-          api_key: 'Julia'
+          api_key: 'Julia',
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347658'
         },
         {
           file_name: 'Dockerfile',
           name: 'Python',
           api_path: 'dockerfiles',
-          api_key: 'Python'
+          api_key: 'Python',
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347660'
         },
         {
           file_name: 'LICENSE',
           name: 'Mozilla Public License 2.0',
           api_path: 'licenses',
-          api_key: 'mpl-2.0'
+          api_key: 'mpl-2.0',
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347657'
         }
       ]
 
       templates.each do |template|
-        it "user adds #{template[:file_name]} via file template #{template[:name]}" do
+        it "user adds #{template[:file_name]} via file template #{template[:name]}", testcase: template[:testcase] do
           content = fetch_template_from_api(template[:api_path], template[:api_key])
 
           Flow::Login.sign_in
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_to_canary_gitaly_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_to_canary_gitaly_spec.rb
new file mode 100644
index 00000000000..78abdb94dfe
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_to_canary_gitaly_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Create', only: { subdomain: %i[staging staging-canary] } do
+    describe 'Git push to canary Gitaly node over HTTP' do
+      it 'pushes to a project using a canary specific Gitaly repository storage', :smoke, :requires_admin, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/351116' do
+        Flow::Login.sign_in_as_admin
+
+        project = Resource::Project.fabricate_via_api! do |storage_project|
+          storage_project.name = 'canary-specific-repository-storage'
+          storage_project.repository_storage = 'nfs-file-cny01' # TODO: move to ENV var
+        end
+
+        Resource::Repository::Push.fabricate! do |push|
+          push.repository_http_uri = project.repository_http_location.uri
+          push.file_name = 'README.md'
+          push.file_content = "# This is a test project named #{project.name}"
+          push.commit_message = 'Add README.md'
+          push.new_branch = true
+        end
+
+        project.visit!
+
+        Page::Project::Show.perform do |project_page|
+          expect(project_page).to have_file('README.md')
+          expect(project_page).to have_readme_content("This is a test project named #{project.name}")
+        end
+      end
+    end
+  end
+end