Merge branch 'fix-gitlab-edition-in-qa' into 'master'

Fix QA image by requiring GitlabEdition instead of Gitlab

See merge request gitlab-org/gitlab!77115

.dockerignore

@@ -5,7 +5,7 @@
 # Following are the files we need:
 # - ./config/initializers/0_inject_enterprise_edition_module.rb
 # - ./ee/app/models/license.rb
-# - ./lib/gitlab.rb
+# - ./lib/gitlab_edition.rb
 # - ./lib/gitlab/utils.rb
 # - ./qa/
 # - ./INSTALLATION_TYPE

config/initializers/0_inject_enterprise_edition_module.rb

@@ -46,7 +46,7 @@ module InjectEnterpriseEditionModule
   end
 
   def each_extension_for(constant_name, namespace)
-    Gitlab.extensions.each do |extension_name|
+    GitlabEdition.extensions.each do |extension_name|
       extension_namespace =
         const_get_maybe_false(namespace, extension_name.upcase)
 

qa/Dockerfile

@@ -77,7 +77,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co
 # The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS)
 COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/
 COPY ./config/bundler_setup.rb /home/gitlab/config/
-COPY ./lib/gitlab.rb /home/gitlab/lib/
+COPY ./lib/gitlab_edition.rb /home/gitlab/lib/
 COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/
 COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/
 

qa/qa.rb

@@ -2,7 +2,7 @@
 
 Encoding.default_external = 'UTF-8'
 
-require_relative '../lib/gitlab'
+require_relative '../lib/gitlab_edition'
 require_relative '../lib/gitlab/utils'
 require_relative '../config/initializers/0_inject_enterprise_edition_module'
 

spec/config/inject_enterprise_edition_module_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe InjectEnterpriseEditionModule do
 
   before do
     # Make sure we're not relying on which mode we're running under
-    allow(Gitlab).to receive(:extensions).and_return([extension_name.downcase])
+    allow(GitlabEdition).to receive(:extensions).and_return([extension_name.downcase])
 
     # Test on an imagined extension and imagined class
     stub_const(fish_name, fish_class) # Fish