Commit 8839a08d authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'qa-copy-license-file-in-qa-image' into 'master'

Copy `ee/app/models/license.rb` in the QA image if present

See merge request gitlab-org/gitlab-ce!32111
parents 519a130c 3733fd20
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# the files we need to build the QA image are in these folders. # the files we need to build the QA image are in these folders.
# Following are the files we need: # Following are the files we need:
# - ./config/initializers/0_inject_enterprise_edition_module.rb # - ./config/initializers/0_inject_enterprise_edition_module.rb
# - ./ee/app/models/license.rb
# - ./lib/gitlab.rb # - ./lib/gitlab.rb
# - ./qa/ # - ./qa/
# - ./INSTALLATION_TYPE # - ./INSTALLATION_TYPE
...@@ -23,7 +24,14 @@ ...@@ -23,7 +24,14 @@
/db/ /db/
/doc/ /doc/
/docker/ /docker/
/ee/ /ee/bin/
/ee/changelogs/
/ee/config/
/ee/db/
/ee/fixtures/
/ee/lib/
/ee/locale/
/ee/spec/
/fixtures/ /fixtures/
/templates/ /templates/
/lint/ /lint/
......
...@@ -50,6 +50,8 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ ...@@ -50,6 +50,8 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
WORKDIR /home/gitlab/qa WORKDIR /home/gitlab/qa
COPY ./qa/Gemfile* /home/gitlab/qa/ COPY ./qa/Gemfile* /home/gitlab/qa/
COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/config/initializers/ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/config/initializers/
# Copy VERSION to ensure the COPY succeeds to copy at least one file since ee/app/models/license.rb isn't present in CE
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 ./INSTALLATION_TYPE /home/gitlab/ COPY ./INSTALLATION_TYPE /home/gitlab/
COPY ./VERSION /home/gitlab/ COPY ./VERSION /home/gitlab/
......
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