diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-11 10:46:06 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-11 10:46:06 +0000 |
| commit | 7df8118a8279d3ed28cad21bbb27e7336dbbc8f2 (patch) | |
| tree | 82abb120abc4f6685a32e7a9c7e1479c9cc82e31 | |
| parent | b17bb9eff54edc563eeed3745a2fe6492c0ec3af (diff) | |
| parent | f86edca66c2baa9fd8b0cdb0d89e961a30c78716 (diff) | |
| download | gitlab-ce-7df8118a8279d3ed28cad21bbb27e7336dbbc8f2.tar.gz | |
Merge branch 'redundant-steps-for-ci' into 'master'
Remove redundant steps from .gitlab-ci-yml configs
See merge request !10425
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 23 |
2 files changed, 7 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d3e3dcd976..df3458b47dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -349,8 +349,6 @@ migration paths: script: - git fetch origin v8.14.10 - 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 exec rake db:drop db:create db:schema:load db:seed_fu - git checkout $CI_COMMIT_SHA diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 6e3f76b8399..6cacb81b8bc 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -15,21 +15,12 @@ retry() { return 1 } -if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then - cp config/database.yml.mysql config/database.yml - sed -i 's/username:.*/username: root/g' config/database.yml - sed -i 's/password:.*/password:/g' config/database.yml - sed -i 's/# socket:.*/host: mysql/g' config/database.yml +cp config/database.yml.mysql config/database.yml +sed -i 's/username:.*/username: root/g' config/database.yml +sed -i 's/password:.*/password:/g' config/database.yml +sed -i 's/# socket:.*/host: mysql/g' config/database.yml - cp config/resque.yml.example config/resque.yml - sed -i 's/localhost/redis/g' config/resque.yml +cp config/resque.yml.example config/resque.yml +sed -i 's/localhost/redis/g' config/resque.yml - export FLAGS="--path vendor --retry 3 --quiet" -else - rnd=$(awk 'BEGIN { srand() ; printf("%d\n",rand()*5) }') - export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin" - cp config/database.yml.mysql config/database.yml - sed "s/username\:.*$/username\: runner/" -i config/database.yml - sed "s/password\:.*$/password\: 'password'/" -i config/database.yml - sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database.yml -fi +export FLAGS="--path vendor --retry 3 --quiet" |