Merge branch 'ee-resolve-scripts-differences' into 'master'

EE: Backport EE changes made to the scripts/ directory

See merge request gitlab-org/gitlab-ee!14778

lib/gitlab.rb

 # frozen_string_literal: true
 
-require_dependency File.expand_path('gitlab/popen', __dir__)
+require 'pathname'
 
 module Gitlab
   def self.root
@@ -61,7 +61,7 @@ module Gitlab
 
   def self.ee?
     @is_ee ||=
-      if ENV['IS_GITLAB_EE'].present?
+      if ENV['IS_GITLAB_EE'] && !ENV['IS_GITLAB_EE'].empty?
         Gitlab::Utils.to_boolean(ENV['IS_GITLAB_EE'])
       else
         # We may use this method when the Rails environment is not loaded. This

lib/tasks/gitlab/db.rake

@@ -70,5 +70,13 @@ namespace :gitlab do
 
       Gitlab::DowntimeCheck.new.check_and_print(migrations)
     end
+
+    desc 'Sets up EE specific database functionality'
+
+    if Gitlab.ee?
+      task setup_ee: %w[geo:db:drop geo:db:create geo:db:schema:load geo:db:migrate]
+    else
+      task :setup_ee
+    end
   end
 end

scripts/static-analysis

 #!/usr/bin/env ruby
 
 # We don't have auto-loading here
+require_relative '../lib/gitlab'
 require_relative '../lib/gitlab/popen'
 require_relative '../lib/gitlab/popen/runner'
 
@@ -26,7 +27,6 @@ def emit_errors(static_analysis)
 end
 
 tasks = [
-  %w[ruby -rbundler/setup scripts/ee_specific_check/ee_specific_check.rb],
   %w[bin/rake lint:all],
   %w[bundle exec license_finder],
   %w[yarn run eslint],
@@ -37,6 +37,10 @@ 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|

scripts/utils.sh

@@ -30,8 +30,7 @@ function setup_db() {
         bundle exec rake add_limits_mysql
     fi
 
-    # EE-only
-    bundle exec rake geo:db:drop geo:db:create geo:db:schema:load geo:db:migrate
+    bundle exec rake gitlab:db:setup_ee
 }
 
 function install_api_client_dependencies_with_apk() {

spec/lib/gitlab_spec.rb

@@ -136,6 +136,12 @@ describe Gitlab do
 
       expect(described_class.ee?).to eq(false)
     end
+
+    it 'returns true when the IS_GITLAB_EE variable is not empty' do
+      stub_env('IS_GITLAB_EE', '1')
+
+      expect(described_class.ee?).to eq(true)
+    end
   end
 
   describe '.http_proxy_env?' do