summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-08-08 10:25:54 +0200
committerAzul <azul@riseup.net>2016-08-08 12:13:05 +0200
commitbef746ae7b215db78be088657bbfaf47c774f943 (patch)
tree54189b0db6271de057cef1f88cc78f3bf908fdc0 /test
parenta1d62a3a1492ca21e1e1d2344fac88bb4d93f324 (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.
Diffstat (limited to 'test')
-rw-r--r--test/config/gitlab/couchdb.yml4
-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-xtest/config/travis/setup_couch.sh (renamed from test/travis/setup_couch.sh)0
5 files changed, 5 insertions, 1 deletions
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