Commit d8b78f24 authored by Rémy Coutable's avatar Rémy Coutable

Add lib/gitlab/utils.rb to the QA image

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b93dda6e
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# - ./config/initializers/0_inject_enterprise_edition_module.rb # - ./config/initializers/0_inject_enterprise_edition_module.rb
# - ./ee/app/models/license.rb # - ./ee/app/models/license.rb
# - ./lib/gitlab.rb # - ./lib/gitlab.rb
# - ./lib/gitlab/utils.rb
# - ./qa/ # - ./qa/
# - ./INSTALLATION_TYPE # - ./INSTALLATION_TYPE
# - ./VERSION # - ./VERSION
...@@ -49,7 +50,6 @@ ...@@ -49,7 +50,6 @@
/lib/flowdock/ /lib/flowdock/
/lib/generators/ /lib/generators/
/lib/gitaly/ /lib/gitaly/
/lib/gitlab/
/lib/api/ /lib/api/
/lib/token/ /lib/token/
/lib/mattermost/ /lib/mattermost/
......
...@@ -54,6 +54,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co ...@@ -54,6 +54,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) # 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 VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/
COPY ./lib/gitlab.rb /home/gitlab/lib/ COPY ./lib/gitlab.rb /home/gitlab/lib/
COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/
COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/
RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet
COPY ./qa /home/gitlab/qa COPY ./qa /home/gitlab/qa
......
...@@ -5,6 +5,7 @@ $: << File.expand_path(File.dirname(__FILE__)) ...@@ -5,6 +5,7 @@ $: << File.expand_path(File.dirname(__FILE__))
Encoding.default_external = 'UTF-8' Encoding.default_external = 'UTF-8'
require_relative '../lib/gitlab' require_relative '../lib/gitlab'
require_relative '../lib/gitlab/utils'
require_relative '../config/initializers/0_inject_enterprise_edition_module' require_relative '../config/initializers/0_inject_enterprise_edition_module'
module QA module QA
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment