Add latest changes from gitlab-org/gitlab@master

4 files changed, 166 insertions, 9 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index c6d0ac6b69a..1cbb770ce48 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -648,6 +648,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/api/resource_milestone_events.md @msedlakjakubowski
 /doc/api/resource_state_events.md @msedlakjakubowski
 /doc/api/resource_weight_events.md @msedlakjakubowski
+/doc/api/rest/index.md @ashrafkhamis
 /doc/api/runners.md @fneill
 /doc/api/saml.md @jglassman1
 /doc/api/scim.md @jglassman1
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index c6885107d9d..df3b3704a52 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -71,6 +71,7 @@ rspec migration pg12:
   extends:
     - .rspec-base-pg12
     - .rspec-base-migration
+    - .rails:rules:ee-and-foss-migration
     - .rspec-migration-parallel
 
 rspec migration pg12 predictive:
@@ -79,18 +80,43 @@ rspec migration pg12 predictive:
     - .predictive-rspec-tests
     - .rails:rules:ee-and-foss-migration:predictive
 
+rspec background_migration pg12:
+  extends:
+    - .rspec-base-pg12
+    - .rspec-base-migration
+    - .rails:rules:ee-and-foss-background-migration
+    - .rspec-background-migration-parallel
+
+rspec background_migration pg12 predictive:
+  extends:
+    - rspec background_migration pg12
+    - .predictive-rspec-tests
+    - .rails:rules:ee-and-foss-background-migration:predictive
+
 rspec migration pg12 single-db:
   extends:
     - rspec migration pg12
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec background_migration pg12 single-db:
+  extends:
+    - rspec background_migration pg12
+    - .single-db-rspec
+    - .rails:rules:single-db
+
 rspec migration pg12 praefect:
   extends:
     - rspec migration pg12
     - .praefect-with-db
     - .rails:rules:praefect-with-db
 
+rspec background_migration pg12 praefect:
+  extends:
+    - rspec background_migration pg12
+    - .praefect-with-db
+    - .rails:rules:praefect-with-db
+
 rspec unit pg12:
   extends:
     - .rspec-base-pg12
@@ -319,10 +345,12 @@ rspec:deprecations:
   # so we use `dependencies` here.
   dependencies:
     - rspec migration pg12
+    - rspec background_migration pg12
     - rspec unit pg12
     - rspec integration pg12
     - rspec system pg12
     - rspec-ee migration pg12
+    - rspec-ee background_migration pg12
     - rspec-ee unit pg12
     - rspec-ee integration pg12
     - rspec-ee system pg12
@@ -349,31 +377,37 @@ rspec:coverage:
     - setup-test-env
     # FOSS/EE jobs
     - rspec migration pg12
+    - rspec background_migration pg12
     - rspec unit pg12
     - rspec integration pg12
     - rspec system pg12
     # FOSS/EE predictive jobs
     - rspec migration pg12 predictive
+    - rspec background_migration pg12 predictive
     - rspec unit pg12 predictive
     - rspec integration pg12 predictive
     - rspec system pg12 predictive
     # FOSS/EE single-db jobs
     - rspec migration pg12 single-db
+    - rspec background_migration pg12 single-db
     - rspec unit pg12 single-db
     - rspec integration pg12 single-db
     - rspec system pg12 single-db
     # EE jobs
     - rspec-ee migration pg12
+    - rspec-ee background_migration pg12
     - rspec-ee unit pg12
     - rspec-ee integration pg12
     - rspec-ee system pg12
     # EE predictive jobs
     - rspec-ee migration pg12 predictive
+    - rspec-ee background_migration pg12 predictive
     - rspec-ee unit pg12 predictive
     - rspec-ee integration pg12 predictive
     - rspec-ee system pg12 predictive
     # EE single-db jobs
     - rspec-ee migration pg12 single-db
+    - rspec-ee background_migration pg12 single-db
     - rspec-ee unit pg12 single-db
     - rspec-ee integration pg12 single-db
     - rspec-ee system pg12 single-db
@@ -383,6 +417,9 @@ rspec:coverage:
     - rspec migration pg12-as-if-foss
     - rspec migration pg12-as-if-foss predictive
     - rspec migration pg12-as-if-foss single-db
+    - rspec background_migration pg12-as-if-foss
+    - rspec background_migration pg12-as-if-foss predictive
+    - rspec background_migration pg12-as-if-foss single-db
     - rspec unit pg12-as-if-foss
     - rspec unit pg12-as-if-foss predictive
     - rspec unit pg12-as-if-foss single-db
@@ -482,12 +519,31 @@ rspec migration pg12-as-if-foss predictive:
     - .predictive-rspec-tests
     - .rails:rules:as-if-foss-migration:predictive
 
+rspec background_migration pg12-as-if-foss:
+  extends:
+    - .rspec-base-pg12-as-if-foss
+    - .rspec-base-migration
+    - .rails:rules:as-if-foss-background-migration
+    - .rspec-background-migration-parallel
+
+rspec background_migration pg12-as-if-foss predictive:
+  extends:
+    - rspec background_migration pg12-as-if-foss
+    - .predictive-rspec-tests
+    - .rails:rules:as-if-foss-background-migration:predictive
+
 rspec migration pg12-as-if-foss single-db:
   extends:
     - rspec migration pg12-as-if-foss
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec background_migration pg12-as-if-foss single-db:
+  extends:
+    - rspec background_migration pg12-as-if-foss
+    - .single-db-rspec
+    - .rails:rules:single-db
+
 rspec unit pg12-as-if-foss:
   extends:
     - .rspec-base-pg12-as-if-foss
@@ -555,12 +611,43 @@ rspec-ee migration pg12 predictive:
     - .predictive-rspec-tests
     - .rails:rules:ee-only-migration:predictive
 
+rspec-ee background_migration pg12:
+  extends:
+    - .rspec-ee-base-pg12
+    - .rspec-base-migration
+    - .rails:rules:ee-only-background-migration
+    - .rspec-ee-background-migration-parallel
+
+rspec-ee background_migration pg12 predictive:
+  extends:
+    - rspec-ee background_migration pg12
+    - .predictive-rspec-tests
+    - .rails:rules:ee-only-background-migration:predictive
+
 rspec-ee migration pg12 single-db:
   extends:
     - rspec-ee migration pg12
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec-ee background_migration pg12 single-db:
+  extends:
+    - rspec-ee background_migration pg12
+    - .single-db-rspec
+    - .rails:rules:single-db
+
+rspec-ee migration pg12 praefect:
+  extends:
+    - rspec migration pg12
+    - .praefect-with-db
+    - .rails:rules:praefect-with-db
+
+rspec-ee background_migration pg12 praefect:
+  extends:
+    - rspec background_migration pg12
+    - .praefect-with-db
+    - .rails:rules:praefect-with-db
+
 rspec-ee unit pg12:
   extends:
     - .rspec-ee-base-pg12
@@ -651,6 +738,13 @@ rspec migration pg11:
     - .rails:rules:rspec-on-pg11
     - .rspec-migration-parallel
 
+rspec background_migration pg11:
+  extends:
+    - .rspec-base-pg11
+    - .rspec-base-migration
+    - .rails:rules:rspec-on-pg11
+    - .rspec-background-migration-parallel
+
 rspec unit pg11:
   extends:
     - .rspec-base-pg11
@@ -677,6 +771,13 @@ rspec migration pg13:
     - .rails:rules:default-branch-schedule-nightly--code-backstage
     - .rspec-migration-parallel
 
+rspec background_migration pg13:
+  extends:
+    - .rspec-base-pg13
+    - .rspec-base-migration
+    - .rails:rules:default-branch-schedule-nightly--code-backstage
+    - .rspec-background-migration-parallel
+
 rspec unit pg13:
   extends:
     - .rspec-base-pg13
@@ -708,6 +809,13 @@ rspec-ee migration pg11:
     - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
     - .rspec-ee-migration-parallel
 
+rspec-ee background_migration pg11:
+  extends:
+    - .rspec-ee-base-pg11
+    - .rspec-base-migration
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+    - .rspec-ee-background-migration-parallel
+
 rspec-ee unit pg11:
   extends:
     - .rspec-ee-base-pg11
@@ -771,6 +879,13 @@ rspec-ee migration pg13:
     - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
     - .rspec-ee-migration-parallel
 
+rspec-ee background_migration pg13:
+  extends:
+    - .rspec-ee-base-pg13
+    - .rspec-base-migration
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+    - .rspec-ee-background-migration-parallel
+
 rspec-ee unit pg13:
   extends:
     - .rspec-ee-base-pg13
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 478b3ee988e..4ca82f55b63 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -58,7 +58,11 @@ include:
   needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"]
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--tag ~quarantine --tag ~level:migration"
+    # We need to exclude background migration because unit tests run with
+    # spec/lib, yet background migration tests are also sitting there,
+    # and they should run on their own jobs so we don't need to run them
+    # in unit tests again.
+    - rspec_paralellized_job "--tag ~quarantine --tag ~level:background_migration"
   allow_failure:
     exit_codes: !reference [.rspec-base, variables, SUCCESSFULLY_RETRIED_TEST_EXIT_CODE]
 
@@ -79,14 +83,9 @@ include:
       junit: ${JUNIT_RESULT_FILE}
 
 .rspec-base-migration:
-  extends:
-    - .base-artifacts
-    - .rails:rules:ee-and-foss-migration
-  variables:
-    RSPEC_TESTS_FILTER_FILE: "${RSPEC_MATCHING_TESTS_PATH}"
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--tag ~quarantine --tag level:migration"
+    - rspec_paralellized_job "--tag ~quarantine"
 
 .rspec-base-pg11:
   extends:
@@ -156,11 +155,17 @@ include:
 ############################
 # rspec job parallel configs
 .rspec-migration-parallel:
-  parallel: 12
+  parallel: 8
 
-.rspec-ee-migration-parallel:
+.rspec-background-migration-parallel:
   parallel: 4
 
+.rspec-ee-migration-parallel:
+  parallel: 2
+
+.rspec-ee-background-migration-parallel:
+  parallel: 2
+
 .rspec-unit-parallel:
   parallel: 28
 
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 80025b4b552..9596594ad26 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1215,6 +1215,18 @@
       changes: *db-patterns
       when: never
 
+.rails:rules:ee-and-foss-background-migration:
+  rules:
+    - !reference [".rails:rules:ee-and-foss-migration", rules]
+    - <<: *if-default-refs
+      changes: *backend-patterns
+
+.rails:rules:ee-and-foss-background-migration:predictive:
+  rules:
+    - !reference [".rails:rules:ee-and-foss-migration:predictive", rules]
+    - <<: *if-merge-request
+      changes: *backend-patterns
+
 .rails:rules:ee-and-foss-mr-with-migration:
   rules:
     - <<: *if-merge-request
@@ -1324,6 +1336,18 @@
       changes: *db-patterns
       when: never
 
+.rails:rules:ee-only-background-migration:
+  rules:
+    - !reference [".rails:rules:ee-only-migration", rules]
+    - <<: *if-default-refs
+      changes: *backend-patterns
+
+.rails:rules:ee-only-background-migration:predictive:
+  rules:
+    - !reference [".rails:rules:ee-only-migration:predictive", rules]
+    - <<: *if-merge-request
+      changes: *backend-patterns
+
 .rails:rules:ee-only-unit:
   rules:
     - <<: *if-not-ee
@@ -1415,6 +1439,18 @@
       changes: *db-patterns
       when: never
 
+.rails:rules:as-if-foss-background-migration:
+  rules:
+    - !reference [".rails:rules:as-if-foss-migration", rules]
+    - <<: *if-merge-request-labels-as-if-foss
+      changes: *backend-patterns
+
+.rails:rules:as-if-foss-background-migration:predictive:
+  rules:
+    - !reference [".rails:rules:as-if-foss-migration:predictive", rules]
+    - <<: *if-merge-request-labels-as-if-foss
+      changes: *backend-patterns
+
 .rails:rules:as-if-foss-unit:
   rules:
     - <<: *if-not-ee