Commit c31c70b2 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Move variables back to where they are

parent 5e6d09ed
...@@ -310,14 +310,14 @@ rake mysql db:rollback: ...@@ -310,14 +310,14 @@ rake mysql db:rollback:
.db-seed_fu: &db-seed_fu .db-seed_fu: &db-seed_fu
stage: test stage: test
<<: *dedicated-runner <<: *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: variables:
SIZE: "1" SIZE: "1"
SETUP_DB: "false" SETUP_DB: "false"
RAILS_ENV: "development" 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: artifacts:
when: on_failure when: on_failure
expire_in: 1d expire_in: 1d
...@@ -417,6 +417,8 @@ bundler:audit: ...@@ -417,6 +417,8 @@ bundler:audit:
.migration-paths: &migration-paths .migration-paths: &migration-paths
stage: test stage: test
<<: *dedicated-runner <<: *dedicated-runner
variables:
SETUP_DB: "false"
only: only:
- master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee - master@gitlab-org/gitlab-ee
...@@ -433,8 +435,6 @@ bundler:audit: ...@@ -433,8 +435,6 @@ bundler:audit:
- bundle install --without production --jobs $(nproc) $FLAGS --retry=3 - bundle install --without production --jobs $(nproc) $FLAGS --retry=3
- source scripts/prepare_build.sh - source scripts/prepare_build.sh
- bundle exec rake db:migrate - bundle exec rake db:migrate
variables:
SETUP_DB: "false"
migration pg paths: migration pg paths:
<<: *migration-paths <<: *migration-paths
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment