Merge branch 'ml-skip-deletion-of-group-scheduled-for-deletion' into 'master'

Skip deletion of group already scheduled to delete

See merge request gitlab-org/gitlab!87633

qa/qa/ee/resource/group_base.rb

@@ -43,6 +43,24 @@ module QA
         def api_iterations_path
           "#{api_get_path}/iterations"
         end
+
+        # Check if the group has already been scheduled to be deleted
+        #
+        # @return [Boolean]
+        def marked_for_deletion?
+          reload!.api_response[:marked_for_deletion_on].present?
+        end
+
+        # Remove the group unless it's already scheduled for deletion.
+        def remove_via_api!
+          if marked_for_deletion?
+            QA::Runtime::Logger.debug("#{self.class.name} #{identifier} is already scheduled to be removed.")
+
+            return
+          end
+
+          super
+        end
       end
     end
   end

qa/qa/resource/group_base.rb

@@ -64,10 +64,6 @@ module QA
         end
       end
-      def marked_for_deletion?
-        reload!.api_response[:marked_for_deletion_on].present?
-      end
-
       # Get group badges
       #
       # @return [Array<QA::Resource::GroupBadge>]