From a84c97186e6ff07db4ee6e202862a8ecb199f6cb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Oct 2016 12:39:06 +0200
Subject: Improve redis config tasks for migration paths job

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f3cb61398d..bd102527502 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -279,19 +279,20 @@ bundler:audit:
 migration paths:
   stage: test
   <<: *use-db
+  variables:
+    SETUP_DB: "false"
   only:
     - master@gitlab-org/gitlab-ce
   script:
     - 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'
+    - cp config/resque.yml.example config/resque.yml
+    - sed -i 's/localhost/redis/g' 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
+    - source scripts/prepare_build.sh
     - rake db:migrate
 
 coverage:
-- 
cgit v1.2.1