Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

2 files changed, 76 insertions, 8 deletions

diff --git a/qa/qa/tools/delete_projects.rb b/qa/qa/tools/delete_projects.rb
new file mode 100644
index 00000000000..bb73033e9d7
--- /dev/null
+++ b/qa/qa/tools/delete_projects.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require_relative '../../qa'
+
+# This script deletes all projects directly under a group specified by ENV['TOP_LEVEL_GROUP_NAME']
+# Required environment variables: GITLAB_QA_ACCESS_TOKEN and GITLAB_ADDRESS
+# Optional environment variable: TOP_LEVEL_GROUP_NAME (defaults to 'gitlab-qa-sandbox-group')
+# Run `rake delete_projects`
+
+module QA
+  module Tools
+    class DeleteProjects
+      include Support::Api
+
+      def initialize
+        raise ArgumentError, "Please provide GITLAB_ADDRESS environment variable" unless ENV['GITLAB_ADDRESS']
+        raise ArgumentError, "Please provide GITLAB_QA_ACCESS_TOKEN environment variable" unless ENV['GITLAB_QA_ACCESS_TOKEN']
+
+        @api_client = Runtime::API::Client.new(ENV['GITLAB_ADDRESS'], personal_access_token: ENV['GITLAB_QA_ACCESS_TOKEN'])
+      end
+
+      def run
+        STDOUT.puts 'Running...'
+
+        # Fetch group's id
+        group_id = fetch_group_id
+
+        projects_head_response = head Runtime::API::Request.new(@api_client, "/groups/#{group_id}/projects", per_page: "100").url
+        total_project_pages = projects_head_response.headers[:x_total_pages]
+
+        # Do not delete projects that are less than 4 days old (for debugging purposes)
+        project_ids = fetch_project_ids(group_id, total_project_pages)
+        STDOUT.puts "Number of projects to be deleted: #{project_ids.length}"
+
+        delete_projects(project_ids) unless project_ids.empty?
+        STDOUT.puts "\nDone"
+      end
+
+      private
+
+      def delete_projects(project_ids)
+        STDOUT.puts "Deleting #{project_ids.length} projects..."
+        project_ids.each do |project_id|
+          delete_response = delete Runtime::API::Request.new(@api_client, "/projects/#{project_id}").url
+          dot_or_f = delete_response.code.between?(200, 300) ? "\e[32m.\e[0m" : "\e[31mF\e[0m"
+          print dot_or_f
+        end
+      end
+
+      def fetch_group_id
+        group_name = ENV['TOP_LEVEL_GROUP_NAME'] || 'gitlab-qa-sandbox-group'
+        group_search_response = get Runtime::API::Request.new(@api_client, "/groups/#{group_name}").url
+        JSON.parse(group_search_response.body)["id"]
+      end
+
+      def fetch_project_ids(group_id, total_project_pages)
+        projects_ids = []
+
+        total_project_pages.to_i.times do |page_no|
+          projects_response = get Runtime::API::Request.new(@api_client, "/groups/#{group_id}/projects", page: (page_no + 1).to_s, per_page: "100").url
+          projects_ids.concat(JSON.parse(projects_response.body).select { |project| Date.parse(project["created_at"]) < Date.today - 3 }.map { |project| project["id"] })
+        end
+
+        projects_ids.uniq
+      end
+    end
+  end
+end
diff --git a/qa/qa/tools/generate_perf_testdata.rb b/qa/qa/tools/generate_perf_testdata.rb
index e77678a1527..546f7e7cdca 100644
--- a/qa/qa/tools/generate_perf_testdata.rb
+++ b/qa/qa/tools/generate_perf_testdata.rb
@@ -95,20 +95,20 @@ module QA
 
       def create_many_merge_requests
         30.times do |i|
-          create_a_merge_request_api_req("#{@group_name}%2F#{@project_name}", "branch#{i}", "master", "MR#{i}")
+          create_a_merge_request_api_req("#{@group_name}%2F#{@project_name}", "branch#{i}", Runtime::Env.default_branch, "MR#{i}")
         end
         @urls[:mr_list_page] = @urls[:project_page] + "/merge_requests"
         STDOUT.puts "Created many MRs: #{@urls[:mr_list_page]}"
       end
 
       def create_many_new_files
-        create_a_new_file_api_req("hello.txt", "master", "#{@group_name}%2F#{@project_name}", "hello", "my new content")
+        create_a_new_file_api_req("hello.txt", Runtime::Env.default_branch, "#{@group_name}%2F#{@project_name}", "hello", "my new content")
         30.times do |i|
-          create_a_new_file_api_req("hello#{i}.txt", "master", "#{@group_name}%2F#{@project_name}", "hello", "my new content")
+          create_a_new_file_api_req("hello#{i}.txt", Runtime::Env.default_branch, "#{@group_name}%2F#{@project_name}", "hello", "my new content")
           create_a_new_file_api_req("hello#{i}.txt", "branch#{i}", "#{@group_name}%2F#{@project_name}", "hello", "my new content")
         end
 
-        @urls[:files_page] = @urls[:project_page] + "/tree/master"
+        @urls[:files_page] = @urls[:project_page] + "/tree/#{Runtime::Env.default_branch}"
         STDOUT.puts "Added many new files: #{@urls[:files_page]}"
       end
 
@@ -138,7 +138,7 @@ module QA
         16.times do |i|
           faker_line_arr = Faker::Lorem.sentences(1500)
           content = faker_line_arr.join("\n\r")
-          create_a_new_file_api_req("hello#{i + 100}.txt", "master", "#{@group_name}%2F#{@project_name}", "Add hello#{i + 100}.txt", content)
+          create_a_new_file_api_req("hello#{i + 100}.txt", Runtime::Env.default_branch, "#{@group_name}%2F#{@project_name}", "Add hello#{i + 100}.txt", content)
           content_arr[i] = faker_line_arr
         end
 
@@ -151,7 +151,7 @@ module QA
           update_file_api_req("hello#{i + 100}.txt", "performance", "#{@group_name}%2F#{@project_name}", "Update hello#{i + 100}.txt", content)
         end
 
-        create_mr_response = create_a_merge_request_api_req("#{@group_name}%2F#{@project_name}", "performance", "master", "Large_MR")
+        create_mr_response = create_a_merge_request_api_req("#{@group_name}%2F#{@project_name}", "performance", Runtime::Env.default_branch, "Large_MR")
 
         iid = JSON.parse(create_mr_response.body)["iid"]
         diff_refs = JSON.parse(create_mr_response.body)["diff_refs"]
@@ -200,7 +200,7 @@ module QA
 
         create_a_branch_api_req(branch_name, project_path)
         create_a_new_file_api_req(file_name, branch_name, project_path, "Initial commit for new file", "Initial file content")
-        create_mr_response = create_a_merge_request_api_req(project_path, branch_name, "master", "MR with many commits-#{SecureRandom.hex(8)}")
+        create_mr_response = create_a_merge_request_api_req(project_path, branch_name, Runtime::Env.default_branch, "MR with many commits-#{SecureRandom.hex(8)}")
         @urls[:mr_with_many_commits] = JSON.parse(create_mr_response.body)["web_url"]
         100.times do |i|
           update_file_api_req(file_name, branch_name, project_path, Faker::Lorem.sentences(5).join(" "), Faker::Lorem.sentences(500).join("\n"))
@@ -268,7 +268,7 @@ module QA
 
       def create_a_branch_api_req(branch_name, project_path_or_id)
         call_api(expected_response_code: 201) do
-          post Runtime::API::Request.new(@api_client, "/projects/#{project_path_or_id}/repository/branches").url, "branch=#{branch_name}&ref=master"
+          post Runtime::API::Request.new(@api_client, "/projects/#{project_path_or_id}/repository/branches").url, "branch=#{branch_name}&ref=#{Runtime::Env.default_branch}"
         end
       end