Merge branch 'acunskis-group-comparison-update' into 'master'

E2E: Compare specific group fields

See merge request gitlab-org/gitlab!61970

qa/qa/resource/group_base.rb

@@ -58,15 +58,21 @@ module QA
       def comparable_group
         reload! if api_response.nil?
 
-        api_resource.except(
-          :id,
-          :web_url,
-          :visibility,
-          :full_name,
-          :full_path,
-          :created_at,
-          :parent_id,
-          :runners_token
+        api_resource.slice(
+          :name,
+          :path,
+          :description,
+          :emails_disabled,
+          :lfs_enabled,
+          :mentions_disabled,
+          :project_creation_level,
+          :request_access_enabled,
+          :require_two_factor_authentication,
+          :share_with_group_lock,
+          :subgroup_creation_level,
+          :two_factor_grace_perion
+          # TODO: Add back visibility comparison once https://gitlab.com/gitlab-org/gitlab/-/issues/331252 is fixed
+          # :visibility
         )
       end
     end

qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb

@@ -70,7 +70,9 @@ module QA
       it(
         'performs bulk group import from another gitlab instance',
         testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785',
-        exclude: { job: ['ce:relative_url', 'ee:relative_url'] } # https://gitlab.com/gitlab-org/gitlab/-/issues/330344
+        exclude: { job: ['ce:relative_url', 'ee:relative_url'] },
+        issue_1: "https://gitlab.com/gitlab-org/gitlab/-/issues/330344",
+        issue_2: "https://gitlab.com/gitlab-org/gitlab/-/issues/331252"
       ) do
         Page::Group::BulkImport.perform do |import_page|
           import_page.import_group(source_group.path, sandbox.path)