[Git][noosfero/noosfero][master] CI: fix gitlab build configuration

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
a97f8e19 by Braulio Bhavamitra at 2015-06-23T00:31:51Z
CI: fix gitlab build configuration

- - - - -


2 changed files:

- .gitlab-ci.yml
- config/database.yml.gitlab-ci


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,10 @@
-before_install:
+before_script:
   - mkdir -p tmp/pids log
   - script/noosfero-plugins disableall
   - bundle check || bundle install
 # database
   - cp config/database.yml.gitlab-ci config/database.yml
-  - dropdb gitlab_ci_test
-  - createdb gitlab_ci_test
+  - createdb gitlab_ci_test || true
   - bundle exec rake db:schema:load
   - bundle exec rake db:migrate
 


=====================================
config/database.yml.gitlab-ci
=====================================
--- a/config/database.yml.gitlab-ci
+++ b/config/database.yml.gitlab-ci
@@ -1,5 +1,6 @@
-# From http://about.travis-ci.org/docs/user/database-setup/
-test:
+test: &TEST
   adapter: postgresql
   database: gitlab_ci_test
-  username: postgres
+  username: gitlab_ci_runner
+development:
+  <<: *TEST



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/a97f8e194ff0d9c2b83e95f679021087ad719f41
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150623/b92a5117/attachment.html>