From 3c86701bc89302550abb9bbaa060132fdcd52480 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 5 May 2022 12:08:03 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 144 +---- .gitlab/ci/review-apps/qa.gitlab-ci.yml | 4 +- .gitlab/ci/test-metadata.gitlab-ci.yml | 3 - .rubocop_todo/rspec/any_instance_of.yml | 1 - GITALY_SERVER_VERSION | 2 +- .../clusters/components/new_cluster.vue | 8 +- .../remove_cluster_confirmation.vue | 2 +- .../gke_cluster_namespace/index.js | 0 .../javascripts/clusters/new_cluster.js | 8 +- .../clusters/stores/new_cluster/index.js | 12 - .../clusters/stores/new_cluster/state.js | 3 - .../components/clusters_actions.vue | 79 ++- .../javascripts/clusters_list/constants.js | 4 +- app/assets/javascripts/clusters_list/index.js | 2 - .../components/cluster_form_dropdown.vue | 246 -------- .../components/create_eks_cluster.vue | 58 -- .../eks_cluster_configuration_form.vue | 530 ----------------- .../components/service_credentials_form.vue | 182 ------ .../create_cluster/eks_cluster/constants.js | 9 - .../create_cluster/eks_cluster/index.js | 55 -- .../services/aws_services_facade.js | 79 --- .../eks_cluster/store/actions.js | 148 ----- .../eks_cluster/store/getters.js | 2 - .../create_cluster/eks_cluster/store/index.js | 49 -- .../eks_cluster/store/mutation_types.js | 19 - .../eks_cluster/store/mutations.js | 66 -- .../create_cluster/eks_cluster/store/state.js | 34 -- .../components/gke_dropdown_mixin.js | 70 --- .../components/gke_machine_type_dropdown.vue | 112 ---- .../components/gke_network_dropdown.vue | 53 -- .../components/gke_project_id_dropdown.vue | 194 ------ .../components/gke_submit_button.vue | 18 - .../components/gke_subnetwork_dropdown.vue | 44 -- .../components/gke_zone_dropdown.vue | 101 ---- .../create_cluster/gke_cluster/constants.js | 11 - .../create_cluster/gke_cluster/gapi_loader.js | 24 - .../create_cluster/gke_cluster/index.js | 95 --- .../gke_cluster/store/actions.js | 99 --- .../gke_cluster/store/getters.js | 5 - .../create_cluster/gke_cluster/store/index.js | 18 - .../gke_cluster/store/mutation_types.js | 8 - .../gke_cluster/store/mutations.js | 28 - .../create_cluster/gke_cluster/store/state.js | 13 - .../create_cluster/init_create_cluster.js | 35 -- .../store/cluster_dropdown/actions.js | 14 - .../store/cluster_dropdown/getters.js | 0 .../store/cluster_dropdown/index.js | 13 - .../store/cluster_dropdown/mutation_types.js | 3 - .../store/cluster_dropdown/mutations.js | 16 - .../store/cluster_dropdown/state.js | 5 - .../components/enable_review_app_modal.vue | 13 +- .../components/import_status.vue | 5 + .../javascripts/import_entities/constants.js | 1 + .../import_entities/import_groups/utils.js | 2 +- .../javascripts/pages/admin/clusters/index.js | 3 - .../pages/groups/clusters/index.js | 2 - .../pages/projects/clusters/index.js | 3 - .../pages/projects/clusters/show/index.js | 2 +- .../admin_runner_edit_app.vue | 4 +- .../runner/admin_runner_edit/index.js | 4 +- .../runner/admin_runner_show/index.js | 3 + .../runner/components/runner_update_form.vue | 27 +- .../dropdown/dropdown_hidden_input.vue | 18 - .../dropdown/dropdown_search_input.vue | 49 -- .../clusters/clusters_controller.rb | 59 +- app/helpers/clusters_helper.rb | 7 - app/mailers/emails/merge_requests.rb | 14 + app/models/concerns/integrations/loggable.rb | 7 + app/models/integrations/jira.rb | 15 +- app/presenters/clusterable_presenter.rb | 16 - .../instance_clusterable_presenter.rb | 20 - app/services/jira/requests/base.rb | 16 +- .../merge_requests/approval_service.rb | 2 + .../merge_requests/remove_approval_service.rb | 1 + app/services/notification_service.rb | 24 + app/views/admin/runners/edit.html.haml | 2 +- .../clusters/clusters/_sidebar.html.haml | 3 +- .../clusters/clusters/aws/_new.html.haml | 17 - .../_cloud_provider_button.html.haml | 8 +- .../_cloud_provider_selector.html.haml | 5 +- app/views/clusters/clusters/connect.html.haml | 2 +- .../clusters/clusters/gcp/_form.html.haml | 87 --- .../gcp/_gcp_not_configured.html.haml | 3 - .../clusters/clusters/gcp/_header.html.haml | 14 - .../clusters/clusters/gcp/_new.html.haml | 5 - app/views/clusters/clusters/new.html.haml | 19 - .../clusters/new_cluster_docs.html.haml | 5 +- .../clusters/clusters/user/_form.html.haml | 6 +- .../approved_merge_request_email.html.haml | 157 +++++ .../approved_merge_request_email.text.haml | 9 + .../unapproved_merge_request_email.html.haml | 156 +++++ .../unapproved_merge_request_email.text.haml | 9 + app/workers/project_service_worker.rb | 13 +- config/routes.rb | 3 +- ..._management_test_reports_requirement_id.rb | 28 + db/schema_migrations/20220503134610 | 1 + db/structure.sql | 6 - doc/administration/incoming_email.md | 30 + doc/api/graphql/reference/index.md | 6 +- doc/api/project_clusters.md | 2 +- doc/operations/metrics/index.md | 2 +- .../policies/img/policies_list_v14_3.png | Bin 34232 -> 0 bytes .../policies/img/policies_list_v15_0.png | Bin 0 -> 75954 bytes .../application_security/policies/index.md | 2 +- .../policies/scan-result-policies.md | 9 +- doc/user/clusters/integrations.md | 2 +- doc/user/infrastructure/clusters/index.md | 1 - .../project/clusters/add_existing_cluster.md | 19 + .../project/clusters/add_remove_clusters.md | 76 +-- doc/user/project/clusters/cluster_access.md | 2 +- .../clusters/gitlab_managed_clusters.md | 2 +- doc/user/project/clusters/runbooks/index.md | 4 +- lib/gitlab/ci/pipeline/metrics.rb | 2 +- locale/gitlab.pot | 390 +----------- qa/qa/ce/strategy.rb | 1 + qa/qa/runtime/browser.rb | 31 +- qa/qa/scenario/template.rb | 10 +- .../api/1_manage/project_access_token_spec.rb | 2 +- .../project/project_access_token_spec.rb | 4 +- ...en_forward_pipeline_variables_true_spec.rb | 3 +- ...n_forward_pipeline_variables_false_spec.rb | 6 +- .../4_verify/pipeline/trigger_matrix_spec.rb | 2 +- qa/qa/specs/knapsack_runner.rb | 20 + qa/qa/specs/runner.rb | 108 ++-- qa/spec/scenario/template_spec.rb | 2 + qa/spec/scenario_shared_examples.rb | 2 + qa/tasks/knapsack.rake | 6 +- .../admin/clusters_controller_spec.rb | 239 -------- .../groups/clusters_controller_spec.rb | 188 ------ .../projects/clusters_controller_spec.rb | 198 ------ spec/features/admin/admin_runners_spec.rb | 15 + spec/features/admin/clusters/eks_spec.rb | 32 - spec/features/groups/clusters/eks_spec.rb | 37 -- spec/features/projects/clusters/eks_spec.rb | 36 -- spec/features/projects/clusters/gcp_spec.rb | 95 +-- spec/features/projects/clusters_spec.rb | 97 +-- .../__snapshots__/new_cluster_spec.js.snap | 2 +- .../clusters/components/new_cluster_spec.js | 10 +- .../gke_cluster_namespace_spec.js | 2 +- .../components/clusters_actions_spec.js | 90 +-- .../components/cluster_form_dropdown_spec.js | 214 ------- .../components/create_eks_cluster_spec.js | 98 --- .../eks_cluster_configuration_form_spec.js | 562 ------------------ .../service_credentials_form_spec.js | 124 ---- .../services/aws_services_facade_spec.js | 178 ------ .../eks_cluster/store/actions_spec.js | 366 ------------ .../eks_cluster/store/getters_spec.js | 13 - .../eks_cluster/store/mutations_spec.js | 161 ----- .../gke_machine_type_dropdown_spec.js | 129 ---- .../components/gke_network_dropdown_spec.js | 137 ----- .../gke_project_id_dropdown_spec.js | 137 ----- .../components/gke_submit_button_spec.js | 51 -- .../gke_subnetwork_dropdown_spec.js | 111 ---- .../components/gke_zone_dropdown_spec.js | 103 ---- .../gke_cluster/gapi_loader_spec.js | 47 -- .../create_cluster/gke_cluster/helpers.js | 64 -- .../create_cluster/gke_cluster/mock_data.js | 75 --- .../gke_cluster/stores/actions_spec.js | 141 ----- .../gke_cluster/stores/getters_spec.js | 103 ---- .../gke_cluster/stores/mutations_spec.js | 32 - .../init_create_cluster_spec.js | 77 --- .../store/cluster_dropdown/actions_spec.js | 95 --- .../store/cluster_dropdown/mutations_spec.js | 36 -- .../import_groups/utils_spec.js | 56 ++ .../admin_runner_edit_app_spec.js | 8 +- .../components/runner_update_form_spec.js | 24 +- .../dropdown/dropdown_hidden_input_spec.js | 36 -- .../dropdown/dropdown_search_input_spec.js | 51 -- spec/helpers/clusters_helper_spec.rb | 12 - spec/mailers/emails/merge_requests_spec.rb | 30 + spec/models/integration_spec.rb | 24 + spec/models/integrations/jira_spec.rb | 23 +- .../group_clusterable_presenter_spec.rb | 18 - .../instance_clusterable_presenter_spec.rb | 12 - .../project_clusterable_presenter_spec.rb | 18 - .../merge_requests/approval_service_spec.rb | 13 + .../remove_approval_service_spec.rb | 8 +- spec/services/notification_service_spec.rb | 55 ++ .../jira/requests/base_shared_examples.rb | 16 +- spec/tooling/quality/test_level_spec.rb | 14 - .../clusters/gcp/_form.html.haml_spec.rb | 26 - spec/workers/project_service_worker_spec.rb | 32 +- tooling/quality/test_level.rb | 6 +- 183 files changed, 1036 insertions(+), 7890 deletions(-) rename app/assets/javascripts/{create_cluster => clusters}/gke_cluster_namespace/index.js (100%) delete mode 100644 app/assets/javascripts/clusters/stores/new_cluster/index.js delete mode 100644 app/assets/javascripts/clusters/stores/new_cluster/state.js delete mode 100644 app/assets/javascripts/create_cluster/components/cluster_form_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/constants.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/index.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/services/aws_services_facade.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/actions.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/getters.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/index.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/mutation_types.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/mutations.js delete mode 100644 app/assets/javascripts/create_cluster/eks_cluster/store/state.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_submit_button.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/constants.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/gapi_loader.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/index.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/actions.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/getters.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/index.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/mutation_types.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/mutations.js delete mode 100644 app/assets/javascripts/create_cluster/gke_cluster/store/state.js delete mode 100644 app/assets/javascripts/create_cluster/init_create_cluster.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/actions.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/getters.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/index.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/mutation_types.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/mutations.js delete mode 100644 app/assets/javascripts/create_cluster/store/cluster_dropdown/state.js delete mode 100644 app/assets/javascripts/pages/admin/clusters/index.js delete mode 100644 app/assets/javascripts/pages/projects/clusters/index.js delete mode 100644 app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue delete mode 100644 app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue delete mode 100644 app/views/clusters/clusters/aws/_new.html.haml delete mode 100644 app/views/clusters/clusters/gcp/_form.html.haml delete mode 100644 app/views/clusters/clusters/gcp/_gcp_not_configured.html.haml delete mode 100644 app/views/clusters/clusters/gcp/_header.html.haml delete mode 100644 app/views/clusters/clusters/gcp/_new.html.haml delete mode 100644 app/views/clusters/clusters/new.html.haml create mode 100644 app/views/notify/approved_merge_request_email.html.haml create mode 100644 app/views/notify/approved_merge_request_email.text.haml create mode 100644 app/views/notify/unapproved_merge_request_email.html.haml create mode 100644 app/views/notify/unapproved_merge_request_email.text.haml create mode 100644 db/post_migrate/20220503134610_remove_requirements_management_test_reports_requirement_id.rb create mode 100644 db/schema_migrations/20220503134610 delete mode 100644 doc/user/application_security/policies/img/policies_list_v14_3.png create mode 100644 doc/user/application_security/policies/img/policies_list_v15_0.png create mode 100644 qa/qa/specs/knapsack_runner.rb delete mode 100644 spec/features/admin/clusters/eks_spec.rb delete mode 100644 spec/features/groups/clusters/eks_spec.rb delete mode 100644 spec/features/projects/clusters/eks_spec.rb rename spec/frontend/{create_cluster => clusters}/gke_cluster_namespace/gke_cluster_namespace_spec.js (96%) delete mode 100644 spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/components/create_eks_cluster_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/services/aws_services_facade_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/store/actions_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/store/getters_spec.js delete mode 100644 spec/frontend/create_cluster/eks_cluster/store/mutations_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_submit_button_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/gapi_loader_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/helpers.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/mock_data.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/stores/actions_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/stores/getters_spec.js delete mode 100644 spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js delete mode 100644 spec/frontend/create_cluster/init_create_cluster_spec.js delete mode 100644 spec/frontend/create_cluster/store/cluster_dropdown/actions_spec.js delete mode 100644 spec/frontend/create_cluster/store/cluster_dropdown/mutations_spec.js create mode 100644 spec/frontend/import_entities/import_groups/utils_spec.js delete mode 100644 spec/frontend/vue_shared/components/dropdown/dropdown_hidden_input_spec.js delete mode 100644 spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js delete mode 100644 spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index b4793f91d36..0095e667449 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -38,7 +38,7 @@ needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"] script: - !reference [.base-script, script] - - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration" + - rspec_paralellized_job "--tag ~quarantine --tag ~level:migration" .base-artifacts: artifacts: @@ -61,7 +61,7 @@ - .rails:rules:ee-and-foss-migration script: - !reference [.base-script, script] - - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration" + - rspec_paralellized_job "--tag ~quarantine --tag level:migration" .rspec-base-pg11: extends: @@ -123,33 +123,6 @@ - .rspec-base - .use-pg13-ee -.rspec-ee-base-geo: - extends: .rspec-base - script: - - !reference [.base-script, script] - - rspec_paralellized_job "--tag ~quarantine --tag geo" - -.rspec-ee-base-geo-pg11: - extends: - - .rspec-ee-base-geo - - .use-pg11-ee - -.rspec-ee-base-geo-pg12: - extends: - - .rspec-ee-base-geo - - .use-pg12-ee - -.rspec-jh-base-geo-pg12: - extends: - - .rspec-jh-base-pg12 - script: - - !reference [.rspec-ee-base-geo, script] - -.rspec-ee-base-geo-pg13: - extends: - - .rspec-ee-base-geo - - .use-pg13-ee - .db-job-base: extends: - .rails-job-base @@ -172,10 +145,7 @@ parallel: 22 .rspec-ee-unit-parallel: - parallel: 14 - -.rspec-ee-unit-geo-parallel: - parallel: 2 + parallel: 16 .rspec-integration-parallel: parallel: 10 @@ -522,9 +492,6 @@ rspec:deprecations: - rspec-ee unit pg12 - rspec-ee integration pg12 - rspec-ee system pg12 - - rspec-ee unit pg12 geo - - rspec-ee integration pg12 geo - - rspec-ee system pg12 geo variables: SETUP_DB: "false" script: @@ -576,14 +543,6 @@ rspec:coverage: - rspec-ee unit pg12 single-db - rspec-ee integration pg12 single-db - rspec-ee system pg12 single-db - # Geo jobs - - rspec-ee unit pg12 geo - - rspec-ee integration pg12 geo - - rspec-ee system pg12 geo - # Geo minimal jobs - - rspec-ee unit pg12 geo minimal - - rspec-ee integration pg12 geo minimal - - rspec-ee system pg12 geo minimal # Memory jobs - memory-on-boot # As-if-FOSS jobs @@ -878,40 +837,6 @@ rspec-ee system pg12 single-db: - .single-db-rspec - .rails:rules:single-db -rspec-ee unit pg12 geo: - extends: - - .rspec-ee-base-geo-pg12 - - .rails:rules:ee-only-unit - - .rspec-ee-unit-geo-parallel - -rspec-ee unit pg12 geo minimal: - extends: - - rspec-ee unit pg12 geo - - .minimal-rspec-tests - - .rails:rules:ee-only-unit:minimal - -rspec-ee integration pg12 geo: - extends: - - .rspec-ee-base-geo-pg12 - - .rails:rules:ee-only-integration - -rspec-ee integration pg12 geo minimal: - extends: - - rspec-ee integration pg12 geo - - .minimal-rspec-tests - - .rails:rules:ee-only-integration:minimal - -rspec-ee system pg12 geo: - extends: - - .rspec-ee-base-geo-pg12 - - .rails:rules:ee-only-system - -rspec-ee system pg12 geo minimal: - extends: - - rspec-ee system pg12 geo - - .minimal-rspec-tests - - .rails:rules:ee-only-system:minimal - rspec-ee migration pg12-as-if-jh: extends: - .rspec-jh-base-pg12 @@ -937,22 +862,6 @@ rspec-ee system pg12-as-if-jh: - .rails:rules:as-if-jh-rspec - .rspec-ee-system-parallel -rspec-ee unit pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - - .rspec-ee-unit-geo-parallel - -rspec-ee integration pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - -rspec-ee system pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - rspec-jh migration pg12-as-if-jh: extends: - .rspec-jh-base-pg12 @@ -974,21 +883,6 @@ rspec-jh system pg12-as-if-jh: - .rspec-jh-base-pg12 - .rails:rules:as-if-jh-rspec -rspec-jh unit pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - -rspec-jh integration pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - -rspec-jh system pg12-as-if-jh geo: - extends: - - .rspec-jh-base-geo-pg12 - - .rails:rules:as-if-jh-rspec - db:rollback geo: extends: - db:rollback @@ -1086,22 +980,6 @@ rspec-ee system pg11: - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - .rspec-ee-system-parallel -rspec-ee unit pg11 geo: - extends: - - .rspec-ee-base-geo-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - - .rspec-ee-unit-geo-parallel - -rspec-ee integration pg11 geo: - extends: - - .rspec-ee-base-geo-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - -rspec-ee system pg11 geo: - extends: - - .rspec-ee-base-geo-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - # PG13 rspec-ee migration pg13: extends: @@ -1127,22 +1005,6 @@ rspec-ee system pg13: - .rspec-ee-base-pg13 - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - .rspec-ee-system-parallel - -rspec-ee unit pg13 geo: - extends: - - .rspec-ee-base-geo-pg13 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - - .rspec-ee-unit-geo-parallel - -rspec-ee integration pg13 geo: - extends: - - .rspec-ee-base-geo-pg13 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - -rspec-ee system pg13 geo: - extends: - - .rspec-ee-base-geo-pg13 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only # EE: default branch nightly scheduled jobs # ##################################### diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index ba5e8c9b112..63a54b3d6e5 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -152,4 +152,6 @@ knapsack-report: - .generate-knapsack-report-base stage: post-qa variables: - QA_KNAPSACK_REPORT_FILE_PATTERN: $CI_PROJECT_DIR/tmp/knapsack/*/*.json + # knapsack report upload uses gitlab-qa image with code already there + GIT_STRATEGY: none + QA_KNAPSACK_REPORT_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/knapsack/*/*.json diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml index 20cbd759ac6..79fea15690c 100644 --- a/.gitlab/ci/test-metadata.gitlab-ci.yml +++ b/.gitlab/ci/test-metadata.gitlab-ci.yml @@ -38,9 +38,6 @@ update-tests-metadata: - rspec-ee unit pg12 - rspec-ee integration pg12 - rspec-ee system pg12 - - rspec-ee unit pg12 geo - - rspec-ee integration pg12 geo - - rspec-ee system pg12 geo script: - run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document" - source ./scripts/rspec_helpers.sh diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml index 1809dd74dc9..51bc272cd63 100644 --- a/.rubocop_todo/rspec/any_instance_of.yml +++ b/.rubocop_todo/rspec/any_instance_of.yml @@ -164,7 +164,6 @@ RSpec/AnyInstanceOf: - spec/controllers/snippets/notes_controller_spec.rb - spec/controllers/snippets_controller_spec.rb - spec/features/admin/admin_mode/login_spec.rb - - spec/features/groups/clusters/eks_spec.rb - spec/features/groups/members/tabs_spec.rb - spec/features/ide/static_object_external_storage_csp_spec.rb - spec/features/issuables/issuable_list_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 7c709c6d081..ae9fa84a927 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -372599313791cb92e579e0ff02279f33cbcd71b5 +1f98d5a94c880e3e556ae3ace095f83e44f002fb diff --git a/app/assets/javascripts/clusters/components/new_cluster.vue b/app/assets/javascripts/clusters/components/new_cluster.vue index 8f3e2916270..41a33a8459f 100644 --- a/app/assets/javascripts/clusters/components/new_cluster.vue +++ b/app/assets/javascripts/clusters/components/new_cluster.vue @@ -1,6 +1,6 @@ @@ -26,7 +24,7 @@ export default {

diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index 98db620e3ab..dca89133931 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -159,7 +159,7 @@ export default { ) }}