diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 15:09:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 15:09:33 +0000 |
commit | ba8e92f7c9938d7dba333d2396cdd14bfa0de726 (patch) | |
tree | 071d3b0577dce2e95eefa6a504910bc7856181f3 /scripts | |
parent | d2d913b606702ecefa01f03362602fde256e3f75 (diff) | |
download | gitlab-ce-ba8e92f7c9938d7dba333d2396cdd14bfa0de726.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/prepare_build.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index ca3dd0eec57..924c430d054 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -32,6 +32,15 @@ else sed -i '/geo:/,/^$/d' config/database.yml fi +# Set up Embedding database if the job name matches `rspec-ee` +# Since Embedding is an EE feature, we shouldn't set it up for non-EE tests. +if [[ "${CI_JOB_NAME}" =~ "rspec-ee" ]]; then + echoinfo "Embedding DB will be set up." +else + echoinfo "Embedding DB won't be set up." + sed -i '/embedding:/,/^$/d' config/database.yml +fi + # Set user to a non-superuser to ensure we test permissions sed -i 's/username: root/username: gitlab/g' config/database.yml |