From 28200bafd932ea10e7f3393ddcd51b368fe6fff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 20 Dec 2021 19:22:58 +0000
Subject: [PATCH] Fix QA image by requiring GitlabEdition instead of Gitlab
---
.dockerignore | 2 +-
config/initializers/0_inject_enterprise_edition_module.rb | 2 +-
qa/Dockerfile | 2 +-
qa/qa.rb | 2 +-
spec/config/inject_enterprise_edition_module_spec.rb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index d20c733313dba..b2aef4d31cda7 100644
--- a/.dockerignore
+++ b/.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
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 41d1043af38d3..1951940a2a169 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -46,7 +46,7 @@ def prepend_module(mod, with_descendants)
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)
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 13213c7c8c8b7..54de650951860 100644
--- a/qa/Dockerfile
+++ b/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/
diff --git a/qa/qa.rb b/qa/qa.rb
index 1cdf6bc89cab1..703ed4ffe1dbb 100644
--- a/qa/qa.rb
+++ b/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'
diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index 61b40e4600154..6ef74a2b616fe 100644
--- a/spec/config/inject_enterprise_edition_module_spec.rb
+++ b/spec/config/inject_enterprise_edition_module_spec.rb
@@ -11,7 +11,7 @@
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
--
GitLab