Cleaning up ee and ce separation inside one repo

Moved any specs that are ee to a specific folder inside spec folder.
Inside this folder the same structure was recreated as in the parent.
Any methods that where ee specific, where moved to the ee base folder.

qa/qa/ee.rb

@@ -72,6 +72,12 @@ module QA
           autoload :MergeRequestApproval, 'qa/ee/page/project/settings/merge_request_approval'
         end
 
+        module Operations
+          module Kubernetes
+            autoload :Show, 'qa/ee/page/project/operations/kubernetes/show'
+          end
+        end
+
         module Pipeline
           autoload :Show, 'qa/ee/page/project/pipeline/show'
         end

qa/qa/ee/page/project/operations/kubernetes/show.rb

+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Project
+        module Operations
+          module Kubernetes
+            module Show
+              def self.prepended(page)
+                page.module_eval do
+                  view 'ee/app/views/projects/clusters/_prometheus_graphs.html.haml' do
+                    element :cluster_health_section
+                  end
+                end
+              end
+
+              def wait_for_cluster_health
+                wait(max: 120, interval: 3, reload: true) do
+                  has_cluster_health_graphs?
+                end
+              end
+
+              def has_cluster_health_title?
+                within_cluster_health_section do
+                  has_text?('Cluster health')
+                end
+              end
+
+              def has_cluster_health_graphs?
+                within_cluster_health_section do
+                  has_text?('CPU Usage')
+                end
+              end
+
+              def within_cluster_health_section
+                within_element :cluster_health_section do
+                  yield
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/page/project/operations/kubernetes/show.rb

@@ -21,10 +21,6 @@ module QA
               element :save_domain
             end
 
-            view 'ee/app/views/projects/clusters/_prometheus_graphs.html.haml' do
-              element :cluster_health_section
-            end
-
             def install!(application_name)
               within(".js-cluster-application-row-#{application_name}") do
                 page.has_button?('Install', wait: 30)
@@ -51,33 +47,11 @@ module QA
             def save_domain
               click_element :save_domain
             end
-
-            def wait_for_cluster_health
-              wait(max: 120, interval: 3, reload: true) do
-                has_cluster_health_graphs?
-              end
-            end
-
-            def has_cluster_health_title?
-              within_cluster_health_section do
-                has_text?('Cluster health')
-              end
-            end
-
-            def has_cluster_health_graphs?
-              within_cluster_health_section do
-                has_text?('CPU Usage')
-              end
-            end
-
-            def within_cluster_health_section
-              within_element :cluster_health_section do
-                yield
-              end
-            end
           end
         end
       end
     end
   end
 end
+
+QA::Page::Project::Operations::Kubernetes::Show.prepend(QA::EE::Page::Project::Operations::Kubernetes::Show)

qa/qa/specs/features/browser_ui/ee_secure/create_project_with_secure_spec.rb → qa/qa/specs/features/ee/browser_ui/secure/create_project_with_secure_spec.rb

@@ -35,7 +35,7 @@ module QA
           push.project = @project
           push.directory = Pathname
             .new(__dir__)
-            .join('../../../../ee/fixtures/secure_premade_reports')
+            .join('../../../../../ee/fixtures/secure_premade_reports')
           push.commit_message = 'Create Secure compatible application to serve premade reports'
         end
 

scripts/ee-files-location-check

@@ -17,10 +17,10 @@ ce_updated_base =
   end
 
 new_files_in_this_branch_not_at_the_ee_top_level =
-  run_git_command("diff #{ee_fetch_base}...HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2").lines.map(&:strip)
+  run_git_command("diff #{ee_fetch_base}...HEAD --name-status --diff-filter=A -- ./ ':!ee' ':!qa/qa/ee' ':!qa/qa/specs/features/ee' | cut -f2").lines.map(&:strip)
 
 ee_specific_files_in_ce_master_not_at_the_ee_top_level =
-  run_git_command("diff #{ce_updated_base}..HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2").lines.map(&:strip)
+  run_git_command("diff #{ce_updated_base}..HEAD --name-status --diff-filter=A -- ./ ':!ee' ':!qa/qa/ee' ':!qa/qa/specs/features/ee' | cut -f2").lines.map(&:strip)
 
 new_ee_specific_files_not_at_the_ee_top_level =
   new_files_in_this_branch_not_at_the_ee_top_level & ee_specific_files_in_ce_master_not_at_the_ee_top_level

scripts/ee_specific_check/ee_specific_check.rb

@@ -4,7 +4,6 @@
 module EESpecificCheck
   WHITELIST = [
     'CHANGELOG-EE.md',
-    'qa/**/*', # https://gitlab.com/gitlab-org/gitlab-ee/issues/4997#note_59764702
     'scripts/**/*',
     'vendor/assets/javascripts/jasmine-jquery.js',
     '.gitlab-ci.yml',
@@ -252,7 +251,7 @@ module EESpecificCheck
 
   def updated_diff_numstat(from, to)
     scan_diff_numstat(
-      run_git_command("diff #{from}..#{to} --numstat -- . ':!ee'"))
+      run_git_command("diff #{from}..#{to} --numstat -- . ':!ee' ':!qa/qa/ee' ':!qa/qa/ee.rb' ':!qa/qa/specs/features/ee'"))
   end
 
   def find_remote_ce_branch