summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-25 08:43:52 +0200
committerRémy Coutable <remy@rymai.me>2016-10-25 08:58:37 +0200
commitd0f0bad2d5b9860006273526e157c796eccd943c (patch)
tree75db7f84481a2528e37c703fd52ab902dd5696c7
parent132e3f547194de1923db258d4022b7f473f176e0 (diff)
downloadgitlab-ce-d0f0bad2d5b9860006273526e157c796eccd943c.tar.gz
Keep the new resque.yml aside and use it once we've checked out master
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab-ci.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76117a48730..9f3cb61398d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,10 +285,13 @@ migration paths:
- git checkout HEAD .
- git fetch --tags
- git checkout v8.5.9
+ - mv config/resque.yml config/resque.yml.new
- 'echo test: unix:/var/opt/gitlab/redis/redis.socket > config/resque.yml'
- bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" --retry=3
- rake db:drop db:create db:schema:load db:seed_fu
- git checkout $CI_BUILD_REF
+ - rm config/resque.yml
+ - mv config/resque.yml.new config/resque.yml
- rake db:migrate
coverage: