.gitlab/ci/rails.gitlab-ci.yml

@@ -341,21 +341,13 @@ gitlab:setup:
 # These intermediate jobs allow us to collect the artifacts of
 # more than 50 jobs and still use `needs:` to ensure a timely execution
 .artifact-collector:
+  extends: .base-artifacts
   stage: post-test
   variables:
     GIT_STRATEGY: none
   image: alpine:3.17
   script:
-    - mkdir -p coverage deprecations rspec auto_explain
-    - ls coverage/ deprecations/ rspec/ auto_explain/
-  artifacts:
-    expire_in: 7d
-    when: always
-    paths:
-      - coverage/
-      - deprecations/
-      - rspec/
-      - auto_explain/
+    - ls -R
 
 rspec:artifact-collector unit:
   extends:

.gitlab/ci/rules.gitlab-ci.yml

@@ -45,10 +45,10 @@
   if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:mr-approved/'
 
 .if-merge-request-approved-and-specific-devops-stage: &if-merge-request-approved-and-specific-devops-stage
-  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && ($CI_MERGE_REQUEST_LABELS =~ /pipeline:mr-approved/ && $CI_MERGE_REQUEST_LABELS =~ /devops::(create|govern|manage)/)'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && ($CI_MERGE_REQUEST_LABELS =~ /pipeline:mr-approved/ && $CI_MERGE_REQUEST_LABELS =~ /devops::(create|govern|manage|plan|verify|package)/)'
 
 .if-merge-request-and-specific-devops-stage: &if-merge-request-and-specific-devops-stage
-  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /devops::(create|govern|manage)/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /devops::(create|govern|manage|plan|verify|package)/'
 
 .if-merge-request-not-approved: &if-merge-request-not-approved
   if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS !~ /pipeline:mr-approved/'

.gitlab/ci/test-on-gdk/main.gitlab-ci.yml

@@ -37,6 +37,10 @@ include:
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
     - !reference [.rules:test:manual, rules]
 
+.parallel:
+  variables:
+    QA_TESTS: "" # Reset to empty, because parallel run should never pass in specific specs
+
 .gdk-qa-base:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23
   extends:

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -41,7 +41,7 @@ Note: Please make sure to run the chatops commands in the Slack channel that get
       as this is the first environment deployed to. Make sure you are [configured to use canary](https://next.gitlab.com/).
 - [ ] If the feature flag causes end-to-end tests to fail, disable the feature flag on staging to avoid blocking [deployments](https://about.gitlab.com/handbook/engineering/deployments-and-releases/deployments/).
 
-For assistance with end-to-end test failures, please reach out via the [`#quality` Slack channel](https://gitlab.slack.com/archives/C3JJET4Q6). Note that end-to-end test failures on `staging-ref` [don't block deployments](https://about.gitlab.com/handbook/engineering/infrastructure/environments/staging-ref/#how-to-use-staging-ref).
+For assistance with end-to-end test failures, please reach out via the [`#test-platform` Slack channel](https://gitlab.slack.com/archives/C3JJET4Q6). Note that end-to-end test failures on `staging-ref` [don't block deployments](https://about.gitlab.com/handbook/engineering/infrastructure/environments/staging-ref/#how-to-use-staging-ref).
 
 ### Specific rollout on production
 

.gitlab/merge_request_templates/Stable Branch.md

@@ -18,6 +18,7 @@ This checklist encourages us to confirm any changes have been analyzed to reduce
 * [ ] This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
 * [ ] The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes).
 * [ ] This MR has a [severity label] assigned (if applicable).
+* [ ] Set the milestone of the merge request to match the target backport branch version.
 * [ ] This MR has been approved by a maintainer (only one approval is required).
 * [ ] Ensure the `e2e:package-and-test-ee` job has either succeeded or been approved by a Software Engineer in Test.
 

.rubocop.yml

@@ -207,8 +207,6 @@ Naming/FileName:
     - 'qa/qa/specs/**/*'
     - 'qa/tasks/**/*.rake'
     - '**/*.ru'
-    - 'app/graphql/types/issue_connection.rb'
-    - 'app/graphql/types/group_connection.rb'
 
   IgnoreExecutableScripts: true
   AllowedAcronyms:

.rubocop_todo/gitlab/avoid_gitlab_instance_checks.yml

@@ -38,7 +38,6 @@ Gitlab/AvoidGitlabInstanceChecks:
     - 'config/initializers/rack_multipart_patch.rb'
     - 'config/initializers/validate_puma.rb'
     - 'config/initializers/warden.rb'
-    - 'ee/app/components/namespaces/storage/limit_alert_component.rb'
     - 'ee/app/controllers/admin/namespace_limits_controller.rb'
     - 'ee/app/controllers/ee/admin/users_controller.rb'
     - 'ee/app/controllers/ee/application_controller.rb'

.rubocop_todo/layout/argument_alignment.yml

@@ -920,9 +920,6 @@ Layout/ArgumentAlignment:
     - 'ee/lib/gitlab/subscription_portal/clients/graphql.rb'
     - 'ee/lib/gitlab/zoekt/search_results.rb'
     - 'ee/spec/components/billing/plan_component_spec.rb'
-    - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20221124090600_add_namespace_ancestry_ids_to_original_index_mapping_spec.rb'
-    - 'ee/spec/elastic/migrate/20221221110300_backfill_traversal_ids_to_blobs_and_wiki_blobs_spec.rb'
     - 'ee/spec/graphql/ee/mutations/boards/lists/create_spec.rb'
     - 'ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb'
     - 'ee/spec/lib/analytics/group_activity_calculator_spec.rb'
@@ -1419,7 +1416,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/pagination_delegate_spec.rb'
     - 'spec/lib/gitlab/path_regex_spec.rb'
     - 'spec/lib/gitlab/profiler_spec.rb'
-    - 'spec/lib/gitlab/redis/sidekiq_status_spec.rb'
     - 'spec/lib/gitlab/repository_cache/preloader_spec.rb'
     - 'spec/lib/gitlab/repository_cache_spec.rb'
     - 'spec/lib/gitlab/search_context/builder_spec.rb'

.rubocop_todo/layout/first_hash_element_indentation.yml

@@ -65,7 +65,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/spec/controllers/projects/repositories_controller_spec.rb'
     - 'ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb'
     - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
     - 'ee/spec/elastic/migrate/migration_shared_examples.rb'
     - 'ee/spec/factories/dependencies.rb'
     - 'ee/spec/factories/licenses.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -67,7 +67,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/app/services/merge_trains/create_pipeline_service.rb'
     - 'ee/app/services/system_notes/epics_service.rb'
     - 'ee/app/workers/concerns/elastic/migration_obsolete.rb'
-    - 'ee/elastic/migrate/20220613120500_migrate_commits_to_separate_index.rb'
     - 'ee/lib/api/experiments.rb'
     - 'ee/lib/api/ldap_group_links.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'

.rubocop_todo/layout/line_length.yml

@@ -3734,7 +3734,6 @@ Layout/LineLength:
     - 'spec/lib/gitlab/email/failure_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_issue_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb'
-    - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_note_on_issuable_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/service_desk_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb'

.rubocop_todo/lint/redundant_cop_disable_directive.yml

@@ -135,7 +135,6 @@ Lint/RedundantCopDisableDirective:
     - 'ee/lib/gitlab/status_page/storage/object.rb'
     - 'ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb'
     - 'ee/spec/controllers/concerns/routable_actions_spec.rb'
-    - 'ee/spec/elastic/migrate/20221026082700_backfill_users_spec.rb'
     - 'ee/spec/features/boards/user_visits_board_spec.rb'
     - 'ee/spec/features/groups/settings/domain_verification_spec.rb'
     - 'ee/spec/helpers/ee/releases_helper_spec.rb'

.rubocop_todo/lint/symbol_conversion.yml

@@ -18,7 +18,6 @@ Lint/SymbolConversion:
     - 'ee/spec/controllers/admin/audit_logs_controller_spec.rb'
     - 'ee/spec/controllers/groups/audit_events_controller_spec.rb'
     - 'ee/spec/controllers/projects/audit_events_controller_spec.rb'
-    - 'ee/spec/elastic/migrate/20220613120500_migrate_commits_to_separate_index_spec.rb'
     - 'ee/spec/factories/vulnerabilities/findings.rb'
     - 'ee/spec/features/admin/subscriptions/admin_views_subscription_spec.rb'
     - 'ee/spec/graphql/resolvers/security_report_summary_resolver_spec.rb'

.rubocop_todo/lint/unused_block_argument.yml

@@ -112,9 +112,6 @@ Lint/UnusedBlockArgument:
     - 'ee/lib/tasks/contracts/merge_requests.rake'
     - 'ee/lib/tasks/gitlab/indexer.rake'
     - 'ee/lib/tasks/gitlab/seed/insights.rake'
-    - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
-    - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20220613120500_migrate_commits_to_separate_index_spec.rb'
     - 'ee/spec/factories/approvers.rb'
     - 'ee/spec/factories/ci/pipelines.rb'
     - 'ee/spec/factories/ci/reports/license_scanning/report.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1739,7 +1739,6 @@ RSpec/ContextWording:
     - 'spec/lib/gitlab/email/failure_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_issue_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb'
-    - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/service_desk_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler_spec.rb'

.rubocop_todo/rspec/empty_line_after_hook.yml

@@ -9,7 +9,6 @@ RSpec/EmptyLineAfterHook:
     - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb'
     - 'ee/spec/lib/gitlab/audit/auditor_spec.rb'
     - 'ee/spec/lib/gitlab/proxy_spec.rb'
-    - 'ee/spec/lib/gitlab/vulnerabilities/container_scanning_vulnerability_spec.rb'
     - 'ee/spec/models/ee/key_spec.rb'
     - 'ee/spec/models/ee/project_spec.rb'
     - 'ee/spec/requests/api/users_spec.rb'

.rubocop_todo/rspec/expect_in_hook.yml

@@ -5,8 +5,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb'
     - 'ee/spec/controllers/groups/seat_usage_controller_spec.rb'
     - 'ee/spec/controllers/subscriptions_controller_spec.rb'
-    - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
-    - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
     - 'ee/spec/features/billings/billing_plans_spec.rb'
     - 'ee/spec/features/boards/new_issue_spec.rb'
     - 'ee/spec/features/projects/feature_flags/user_creates_feature_flag_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -12,23 +12,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/controllers/projects/security/configuration_controller_spec.rb'
     - 'ee/spec/controllers/users_controller_spec.rb'
     - 'ee/spec/db/production/license_spec.rb'
-    - 'ee/spec/elastic/migrate/20201105181100_apply_max_analyzed_offset_spec.rb'
-    - 'ee/spec/elastic/migrate/20201116142400_add_new_data_to_issues_documents_spec.rb'
-    - 'ee/spec/elastic/migrate/20201123123400_migrate_issues_to_separate_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210112165500_delete_issues_from_original_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210127154600_remove_permissions_data_from_notes_documents_spec.rb'
-    - 'ee/spec/elastic/migrate/20210128163600_add_permissions_data_to_notes_documents_spec.rb'
-    - 'ee/spec/elastic/migrate/20210201104800_migrate_notes_to_separate_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210421140400_add_new_data_to_merge_requests_documents_spec.rb'
-    - 'ee/spec/elastic/migrate/20210429154500_migrate_merge_requests_to_separate_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210510113500_delete_merge_requests_from_original_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210510143200_delete_notes_from_original_index_spec.rb'
-    - 'ee/spec/elastic/migrate/20210623081800_add_upvotes_to_issues_spec.rb'
-    - 'ee/spec/elastic/migrate/20210722112500_add_upvotes_mappings_to_merge_requests_spec.rb'
-    - 'ee/spec/elastic/migrate/20210813134600_add_namespace_ancestry_to_issues_mapping_spec.rb'
-    - 'ee/spec/elastic/migrate/20210825110300_backfill_namespace_ancestry_for_issues_spec.rb'
-    - 'ee/spec/elastic/migrate/20210910094600_add_namespace_ancestry_ids_to_issues_mapping_spec.rb'
-    - 'ee/spec/elastic/migrate/20210910100000_redo_backfill_namespace_ancestry_ids_for_issues_spec.rb'
     - 'ee/spec/features/admin/admin_emails_spec.rb'
     - 'ee/spec/features/admin/admin_settings_spec.rb'
     - 'ee/spec/features/promotion_spec.rb'
@@ -3354,7 +3337,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/email/failure_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_issue_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb'
-    - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_note_on_issuable_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/service_desk_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb'
@@ -3386,7 +3368,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/etag_caching/router/rails_spec.rb'
     - 'spec/lib/gitlab/etag_caching/router_spec.rb'
     - 'spec/lib/gitlab/etag_caching/store_spec.rb'
-    - 'spec/lib/gitlab/event_store/event_spec.rb'
     - 'spec/lib/gitlab/event_store/store_spec.rb'
     - 'spec/lib/gitlab/exception_log_formatter_spec.rb'
     - 'spec/lib/gitlab/exceptions_app_spec.rb'
@@ -3906,7 +3887,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/redis/rate_limiting_spec.rb'
     - 'spec/lib/gitlab/redis/sessions_spec.rb'
     - 'spec/lib/gitlab/redis/shared_state_spec.rb'
-    - 'spec/lib/gitlab/redis/sidekiq_status_spec.rb'
     - 'spec/lib/gitlab/redis/trace_chunks_spec.rb'
     - 'spec/lib/gitlab/redis/wrapper_spec.rb'
     - 'spec/lib/gitlab/reference_counter_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -519,7 +519,6 @@ RSpec/NamedSubject:
     - 'ee/spec/lib/gitlab/subscription_portal/clients/graphql_spec.rb'
     - 'ee/spec/lib/gitlab/tree_summary_spec.rb'
     - 'ee/spec/lib/gitlab/usage_data_metrics_spec.rb'
-    - 'ee/spec/lib/gitlab/vulnerabilities/parser_spec.rb'
     - 'ee/spec/lib/gitlab/vulnerability_scanning/track_cvs_service_spec.rb'
     - 'ee/spec/lib/gitlab_subscriptions/upcoming_reconciliation_entity_spec.rb'
     - 'ee/spec/lib/omni_auth/strategies/kerberos_spec.rb'
@@ -2374,7 +2373,6 @@ RSpec/NamedSubject:
     - 'spec/lib/gitlab/redis/db_load_balancing_spec.rb'
     - 'spec/lib/gitlab/redis/multi_store_spec.rb'
     - 'spec/lib/gitlab/redis/queues_spec.rb'
-    - 'spec/lib/gitlab/redis/sidekiq_status_spec.rb'
     - 'spec/lib/gitlab/reference_extractor_spec.rb'
     - 'spec/lib/gitlab/regex_spec.rb'
     - 'spec/lib/gitlab/relative_positioning/item_context_spec.rb'

.rubocop_todo/rspec/return_from_stub.yml

@@ -141,7 +141,6 @@ RSpec/ReturnFromStub:
     - 'spec/lib/gitlab/prometheus_client_spec.rb'
     - 'spec/lib/gitlab/redis/cache_spec.rb'
     - 'spec/lib/gitlab/redis/shared_state_spec.rb'
-    - 'spec/lib/gitlab/redis/sidekiq_status_spec.rb'
     - 'spec/lib/gitlab/relative_positioning/range_spec.rb'
     - 'spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb'
     - 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb'