diff options
| author | Azul <azul@riseup.net> | 2016-08-08 10:25:54 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-08-08 12:13:05 +0200 |
| commit | bef746ae7b215db78be088657bbfaf47c774f943 (patch) | |
| tree | 54189b0db6271de057cef1f88cc78f3bf908fdc0 | |
| parent | a1d62a3a1492ca21e1e1d2344fac88bb4d93f324 (diff) | |
[ci] setup couch for gitlab
Couch docker image will be available on the host called couchdb.
So we use curl to check for it and display the version string.
And then we move a couchdb.yml config file into place so the right host
will be used.
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | test/config/gitlab/couchdb.yml | 4 | ||||
| -rw-r--r-- | test/config/travis/couchdb.admin.yml (renamed from test/config/couchdb.admin.yml) | 2 | ||||
| -rw-r--r-- | test/config/travis/couchdb.yml (renamed from test/config/couchdb.yml) | 0 | ||||
| -rw-r--r-- | test/config/travis/ruby-version (renamed from test/travis/ruby-version) | 0 | ||||
| -rwxr-xr-x | test/config/travis/setup_couch.sh (renamed from test/travis/setup_couch.sh) | 0 |
7 files changed, 18 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df920d0..01d8d52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ image: "ruby:2.1" # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service services: - couchdb:1.6.1 - + # Cache gems in between builds cache: paths: @@ -17,13 +17,15 @@ cache: # This is a basic example for a gem or script which doesn't use # services such as redis or postgres before_script: - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-ri --no-rdoc # Bundler is not installed with the image - - bundle install -j $(nproc) --path vendor # Install dependencies into ./vendor/ruby - - export RAILS_ENV=test + - ruby -v + - curl -s couchdb:5984 + - cp test/config/gitlab/couchdb.yml config/couchdb.admin.yml + - cp test/config/gitlab/couchdb.yml config + - gem install bundler --no-ri --no-rdoc + - bundle install -j $(nproc) --path vendor --without development debug + - bundle exec rake RAILS_ENV=test db:rotate + - bundle exec rake RAILS_ENV=test db:migrate rails: script: - - bundle exec rake db:rotate - - bundle exec rake db:migrate - bundle exec rake test diff --git a/.travis.yml b/.travis.yml index 4e7aad0..2681951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ before_install: - "gem install bundler --version 1.11.2" before_script: - "rm .ruby-version" - - "mv test/travis/ruby-version .ruby-version" - - "test/travis/setup_couch.sh" - - "mv test/config/couchdb.admin.yml config/couchdb.admin.yml" - - "mv test/config/couchdb.yml config/couchdb.yml" + - "mv test/config/travis/ruby-version .ruby-version" + - "test/config/travis/setup_couch.sh" + - "mv test/config/travis/couchdb.admin.yml config/couchdb.admin.yml" + - "mv test/config/travis/couchdb.yml config/couchdb.yml" - "bundle exec rake RAILS_ENV=test db:rotate" - "bundle exec rake RAILS_ENV=test db:migrate" after_script: diff --git a/test/config/gitlab/couchdb.yml b/test/config/gitlab/couchdb.yml new file mode 100644 index 0000000..5d4f71f --- /dev/null +++ b/test/config/gitlab/couchdb.yml @@ -0,0 +1,4 @@ +test: + auto_update_design_doc: false + host: "couchdb" + prefix: "" diff --git a/test/config/couchdb.admin.yml b/test/config/travis/couchdb.admin.yml index 0988bc1..7c9584c 100644 --- a/test/config/couchdb.admin.yml +++ b/test/config/travis/couchdb.admin.yml @@ -3,4 +3,4 @@ test: username: "anna" password: "secret" prefix: "" - + diff --git a/test/config/couchdb.yml b/test/config/travis/couchdb.yml index 9c8b67b..9c8b67b 100644 --- a/test/config/couchdb.yml +++ b/test/config/travis/couchdb.yml diff --git a/test/travis/ruby-version b/test/config/travis/ruby-version index 68b3a4c..68b3a4c 100644 --- a/test/travis/ruby-version +++ b/test/config/travis/ruby-version diff --git a/test/travis/setup_couch.sh b/test/config/travis/setup_couch.sh index 0502c12..0502c12 100755 --- a/test/travis/setup_couch.sh +++ b/test/config/travis/setup_couch.sh |