Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
index 10321303873..d4c4ec5611a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
@@ -100,10 +100,11 @@ module QA
             expect(import_page).to have_imported_group(source_group.path, wait: 180)
 
             expect { imported_group.reload! }.to eventually_eq(source_group).within(duration: 10)
-            expect { imported_subgroup.reload! }.to eventually_eq(subgroup).within(duration: 30)
-
             expect { imported_group.labels }.to eventually_include(*source_group.labels).within(duration: 10)
-            expect { imported_subgroup.labels }.to eventually_include(*subgroup.labels).within(duration: 30)
+
+            # Do not validate subgroups until https://gitlab.com/gitlab-org/gitlab/-/issues/332818 is resolved
+            # expect { imported_subgroup.reload! }.to eventually_eq(subgroup).within(duration: 30)
+            # expect { imported_subgroup.labels }.to eventually_include(*subgroup.labels).within(duration: 30)
           end
         end
       end