Merge branch 'disable-tests-for-gitlab-foss' into 'master'

Update CI checks for the single codebase

Closes #32153, #17548, #17554, #20364, #21519, #23219, and #25990

See merge request gitlab-org/gitlab!16810

.gitlab/ci/rails.gitlab-ci.yml

@@ -350,7 +350,9 @@ quick-rspec geo pg-10 ee:
       - $CI_COMMIT_REF_NAME =~ /(^geo[\/-].*|.*-geo$)/
 
 rspec quarantine pg ee:
-  extends: rspec quarantine pg
+  extends:
+    - rspec quarantine pg
+    - .only-ee
   script:
     - export NO_KNAPSACK=1 CACHE_CLASSES=true
     - scripts/gitaly-test-spawn

lib/tasks/ee_compat_check.rake

-desc 'Checks if the branch would apply cleanly to EE'
-task ee_compat_check: :environment do
-  Rake::Task['gitlab:dev:ee_compat_check'].invoke
-end

lib/tasks/gitlab/dev.rake

-namespace :gitlab do
-  namespace :dev do
-    desc 'Checks if the branch would apply cleanly to EE'
-    task :ee_compat_check, [:branch] => :environment do |_, args|
-      opts =
-        if ENV['CI']
-          {
-            ce_project_url: ENV['CI_PROJECT_URL'],
-            branch: ENV['CI_COMMIT_REF_NAME'],
-            job_id: ENV['CI_JOB_ID']
-          }
-        else
-          unless args[:branch]
-            puts "Must specify a branch as an argument".color(:red)
-            exit 1
-          end
-
-          args
-        end
-
-      if File.basename(Rails.root) == 'gitlab'
-        puts "Skipping EE projects"
-        exit 0
-      elsif Gitlab::EeCompatCheck.new(opts || {}).check
-        exit 0
-      else
-        exit 1
-      end
-    end
-  end
-end

lib/tasks/lint.rake

@@ -28,14 +28,23 @@ unless Rails.env.production?
     task :all do
       status = 0
 
-      %w[
+      tasks = %w[
         config_lint
         lint:haml
         scss_lint
         gettext:lint
-        gettext:updated_check
         lint:static_verification
-      ].each do |task|
+      ]
+
+      if Gitlab.ee?
+        # This task will fail on CE installations (e.g. gitlab-org/gitlab-foss)
+        # since it will detect strings in the locale files that do not exist in
+        # the source files. To work around this we will only enable this task on
+        # EE installations.
+        tasks << 'gettext:updated_check'
+      end
+
+      tasks.each do |task|
         pid = Process.fork do
           puts "*** Running rake task: #{task} ***"
 

scripts/static-analysis

@@ -37,10 +37,6 @@ tasks = [
   %w[scripts/lint-rugged]
 ]
 
-if Gitlab.ee?
-  tasks.unshift(%w[ruby -rbundler/setup scripts/ee_specific_check/ee_specific_check.rb])
-end
-
 static_analysis = Gitlab::Popen::Runner.new
 
 static_analysis.run(tasks) do |cmd, &run|