Skip to content

Commit

Permalink
Fixec CircleCI tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
pozgo committed Dec 9, 2015
1 parent 7c2a8fa commit dd57a63
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
test:
override:
- while true; do if grep "You can now connect to this MariaDB Server" -a ${CIRCLE_ARTIFACTS}/db.log; then break; else sleep 1; fi done
- docker run -d --name zabbix --link db:zabbix.db -p 80:80 -p 10051:10051 --env="DB_ADDRESS=zabbix.db" --env="DB_USER=$DB_USER" --env="DB_PASS=$DB_PASS" million12/zabbix-server-base:test
- docker run -d --name zabbix --link db:zabbix.db -p 80:80 -p 10051:10051 --env="ZS_DBHost=zabbix.db" --env="ZS_DBUser=$DB_USER" --env="ZS_DBPassword=$DB_PASS" million12/zabbix-server-base:test
- docker logs -f zabbix | tee -a ${CIRCLE_ARTIFACTS}/zabbix.log:
background: true
- while true; do if grep "nginx entered RUNNING state" -a ${CIRCLE_ARTIFACTS}/zabbix.log; then break; else sleep 1; fi done
Expand All @@ -29,4 +29,4 @@ test:
- docker logs -f zabbix | tee -a ${CIRCLE_ARTIFACTS}/zabbix-after-restart.log:
background: true
- while true; do if grep "nginx entered RUNNING state" -a ${CIRCLE_ARTIFACTS}/zabbix-after-restart.log; then break; else sleep 1; fi done
- curl -s -L --head http://127.0.0.1/ | grep "HTTP/1.1 200 OK"
- curl -s -L --head http://127.0.0.1/ | grep "HTTP/1.1 200 OK"

0 comments on commit dd57a63

Please sign in to comment.