ci: Change the way we skip env loading in some rake tasks

Signed-off-by: Rémy Coutable <remy@rymai.me>

ee/lib/tasks/gitlab/indexer.rake

@@ -3,7 +3,7 @@
 namespace :gitlab do
   namespace :indexer do
     desc "GitLab | Indexer | Install or upgrade gitlab-elasticsearch-indexer"
-    task :install, [:dir, :repo] => :with_gitlab_helpers do |t, args|
+    task :install, [:dir, :repo] => :gitlab_environment do |t, args|
       unless args.dir.present?
         abort %(Please specify the directory where you want to install the indexer
 Usage: rake "gitlab:indexer:install[/installation/dir,repo]")

lib/tasks/gitlab/gitaly.rake

@@ -3,7 +3,7 @@
 namespace :gitlab do
   namespace :gitaly do
     desc 'GitLab | Gitaly | Install or upgrade gitaly'
-    task :install, [:dir, :storage_path, :repo] => :with_gitlab_helpers do |t, args|
+    task :install, [:dir, :storage_path, :repo] => :gitlab_environment do |t, args|
       warn_user_is_not_gitlab
 
       unless args.dir.present? && args.storage_path.present?

lib/tasks/gitlab/helpers.rake

@@ -3,10 +3,8 @@
 # Prevent StateMachine warnings from outputting during a cron task
 StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON']
 
-task gitlab_environment: :environment do
-  extend SystemCheck::Helpers
-end
+task :gitlab_environment do
+  Rake::Task[:environment].invoke unless ENV['SKIP_RAILS_ENV_IN_RAKE']
 
-task :with_gitlab_helpers do
   extend SystemCheck::Helpers
 end

scripts/setup-test-env

@@ -11,6 +11,8 @@ require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/numeric'
 require 'active_support/string_inquirer'
 
+ENV['SKIP_RAILS_ENV_IN_RAKE'] = 'true'
+
 module Rails
   extend self
 

spec/support/helpers/test_env.rb

@@ -521,8 +521,14 @@ module TestEnv
       # Cleanup the component entirely to ensure we start fresh
       FileUtils.rm_rf(install_dir)
 
-      unless Rake::Task[task].invoke(*task_args)
-        raise ComponentFailedToInstallError
+      if ENV['SKIP_RAILS_ENV_IN_RAKE']
+        # When we run `scripts/setup-test-env`, we take care of loading the necessary dependencies
+        # so we can run the rake task programmatically.
+        Rake::Task[task].invoke(*task_args)
+      else
+        # In other cases, we run the task via `rake` so that the environment
+        # and dependencies are automatically loaded.
+        raise ComponentFailedToInstallError unless system('rake', "#{task}[#{task_args.join(',')}]")
       end
 
       yield if block_given?