Merge branch...

Merge branch '480329-resolve-cross-table-interaction-issues-in-ee-spec-services-sbom-ingestion-tasks' into 'master' 

Resolve cross table interaction issues in ee/spec/services/sbom/ingestion/tasks/ingest_occurrences_spec.rb

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167682



Merged-by: Michał Zając <mzajac@gitlab.com>
Approved-by: Michał Zając <mzajac@gitlab.com>
Co-authored-by: Gregory <11164960-ghavenga@users.noreply.gitlab.com>

ee/spec/services/sbom/ingestion/tasks/ingest_occurrences_spec.rb

@@ -345,27 +345,23 @@
   end
 
   def expected_attributes_for(occurrence_map)
-    Gitlab::Database.allow_cross_joins_across_databases(
-      url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480165'
-    ) do
-      {
-        ancestors: occurrence_map.ancestors,
-        archived: project.archived,
-        commit_sha: pipeline.sha,
-        component_id: occurrence_map.component_id,
-        component_name: occurrence_map.name,
-        component_version_id: occurrence_map.component_version_id,
-        input_file_path: occurrence_map.input_file_path,
-        licenses: default_licenses,
-        package_manager: occurrence_map.packager,
-        pipeline_id: pipeline.id,
-        project_id: project.id,
-        reachability: occurrence_map.reachability,
-        source_id: occurrence_map.source_id,
-        source_package_id: occurrence_map.source_package_id,
-        traversal_ids: project.namespace.traversal_ids
-      }.deep_stringify_keys!
-    end
+    {
+      ancestors: occurrence_map.ancestors,
+      archived: project.archived,
+      commit_sha: pipeline.sha,
+      component_id: occurrence_map.component_id,
+      component_name: occurrence_map.name,
+      component_version_id: occurrence_map.component_version_id,
+      input_file_path: occurrence_map.input_file_path,
+      licenses: default_licenses,
+      package_manager: occurrence_map.packager,
+      pipeline_id: pipeline.id,
+      project_id: project.id,
+      reachability: occurrence_map.reachability,
+      source_id: occurrence_map.source_id,
+      source_package_id: occurrence_map.source_package_id,
+      traversal_ids: project.namespace.traversal_ids
+    }.deep_stringify_keys!
   end
 
   def create_pm_packages