Fix the CI

This commit is contained in:
Thomas Sileo 2018-05-21 12:23:53 +02:00
parent 77a3197ad6
commit 4a0a351402
3 changed files with 16 additions and 2 deletions

View file

@ -17,8 +17,8 @@ script:
- cp -r tests/fixtures/me.yml config/me.yml - cp -r tests/fixtures/me.yml config/me.yml
- docker-compose up -d - docker-compose up -d
- docker-compose ps - docker-compose ps
- WEB_PORT=5006 DATA_DIR=./tests/fixtures/instance1/data CONFIG_DIR=./tests/fixtures/instance1/config docker-compose -p instance1 up - WEB_PORT=5006 DATA_DIR=tests/fixtures/instance1/data CONFIG_DIR=tests/fixtures/instance1/config docker-compose -p instance1 up -d
- docker-compose -p instance1 ps - docker-compose -p instance1 ps
- WEB_PORT=5007 DATA_DIR=./tests/fixtures/instance2/data CONFIG_DIR=./tests/fixtures/instance2/config docker-compose -p instance2 up - WEB_PORT=5007 DATA_DIR=tests/fixtures/instance2/data CONFIG_DIR=tests/fixtures/instance2/config docker-compose -p instance2 up -d
- docker-compose -p instance2 ps - docker-compose -p instance2 ps
- pytest -v --ignore data - pytest -v --ignore data

View file

@ -0,0 +1,7 @@
username: 'instance_1'
name: 'Instance 1'
icon_url: 'https://sos-ch-dk-2.exo.io/microblogpub/microblobpub.png'
domain: 'localhost:5006'
summary: 'instance 1 summary'
pass: '$2b$12$nEgJMgaYbXSPOvgnqM4jSeYnleKhXqsFgv/o3hg12x79uEdsR4cUy' # hello
https: false

View file

@ -0,0 +1,7 @@
username: 'instance_2'
name: 'Instance 2'
icon_url: 'https://sos-ch-dk-2.exo.io/microblogpub/microblobpub.png'
domain: 'localhost:5007'
summary: 'instance 2 summary'
pass: '$2b$12$nEgJMgaYbXSPOvgnqM4jSeYnleKhXqsFgv/o3hg12x79uEdsR4cUy' # hello
https: false