summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-04-11 02:32:20 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-04-11 02:32:20 +0800
commitc31c70b2fa01acef8842e68a3799ba72d0b3300a (patch)
treeccb887bafc2714b7dc4f4d7cf58901b662eac6d3 /.gitlab-ci.yml
parent5e6d09edba4c782237544ac46edc320a27bcd98f (diff)
downloadgitlab-ce-c31c70b2fa01acef8842e68a3799ba72d0b3300a.tar.gz
Move variables back to where they are
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbe7d02389a..31db88a19fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -310,14 +310,14 @@ rake mysql db:rollback:
.db-seed_fu: &db-seed_fu
stage: test
<<: *dedicated-runner
- script:
- - git clone https://gitlab.com/gitlab-org/gitlab-test.git
- /home/git/repositories/gitlab-org/gitlab-test.git
- - bundle exec rake db:setup db:seed_fu
variables:
SIZE: "1"
SETUP_DB: "false"
RAILS_ENV: "development"
+ script:
+ - git clone https://gitlab.com/gitlab-org/gitlab-test.git
+ /home/git/repositories/gitlab-org/gitlab-test.git
+ - bundle exec rake db:setup db:seed_fu
artifacts:
when: on_failure
expire_in: 1d
@@ -417,6 +417,8 @@ bundler:audit:
.migration-paths: &migration-paths
stage: test
<<: *dedicated-runner
+ variables:
+ SETUP_DB: "false"
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
@@ -433,8 +435,6 @@ bundler:audit:
- bundle install --without production --jobs $(nproc) $FLAGS --retry=3
- source scripts/prepare_build.sh
- bundle exec rake db:migrate
- variables:
- SETUP_DB: "false"
migration pg paths:
<<: *migration-paths