From d0f0bad2d5b9860006273526e157c796eccd943c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 25 Oct 2016 08:43:52 +0200
Subject: [PATCH] Keep the new resque.yml aside and use it once we've checked
out master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
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:
--
GitLab