diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 01:36:06 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 01:36:06 +0300 |
| commit | be032e41ff4aa2779c56e9eca05dce3cf85c1144 (patch) | |
| tree | 88763a0a8d42b3150b8250940d11c74a3736ca9d | |
| parent | 0472bc66f3d9197455e755813c952a579e17f4a8 (diff) | |
| parent | 35cb7c00d552cac61177d6c9083bcbebc79bba48 (diff) | |
Merge branch 'fix-migration-paths' into 'master'
Fix migration paths
This fixes `migration paths` failure, preventing the `knapsack` from auto-balancing test suites:
https://gitlab.com/gitlab-org/gitlab-ce/builds/6485942
cc @stanhu
See merge request !7640
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 436e9ec6c60..bb94fc41ad1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -319,12 +319,11 @@ migration paths: - master@gitlab/gitlabhq - master@gitlab/gitlab-ee script: - - git checkout HEAD . - - git fetch --tags - - git checkout v8.5.9 + - git fetch origin v8.5.9 + - git checkout -f FETCH_HEAD - 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 + - 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 - source scripts/prepare_build.sh |