Skip to content

Commit

Permalink
Merge branch 'bugfix/travis' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vmalloc committed May 8, 2020
2 parents 696491f + 56cf26d commit 61d0f01
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ after_failure:
- sudo docker logs backslash_python-backend-ui_1
- sudo docker logs backslash_python-backend-api_1
- sudo docker logs backslash_api-server_1
- sudo docker logs backslash_db_1

after_success:
- pipenv run travis_publish
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## Version 2.17.3

**NOTE**: the default `BACKSLASH_DATABASE_URI` has been changed in this release (in
`docker-compose.yml`). When upgrading an existing instance, make sure to leave the
`BACKSLASH_DATABASE_URI` in your docker-compose file as it were before the upgrade, or otherwise
the backend will lose ability to connect to the database.

* Fix Travis deployment


## Version 2.17.2

Expand Down
5 changes: 3 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
environment: &python-backend-env
- CONFIG_DIRECTORY=/conf
- BACKSLASH_REDIS_SERVER=redis
- BACKSLASH_DATABASE_URI=postgresql://backslash@db/backslash
- BACKSLASH_DATABASE_URI=postgresql://backslash:backslash@db/backslash
- BACKSLASH_TRACEBACKS_PATH=/uploads/tracebacks
- BACKSLASH_CELERY_BROKER_URL=amqp://guest:guest@rabbitmq
- METRICS_URL=http://api-server:8000/
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
environment:
- CONFIG_DIRECTORY=/conf
- BACKSLASH_REDIS_SERVER=redis
- BACKSLASH_DATABASE_URI=postgresql://backslash@db/backslash
- BACKSLASH_DATABASE_URI=postgresql://backslash:backslash@db/backslash
- BACKSLASH_TRACEBACKS_PATH=/uploads/tracebacks
- BACKSLASH_CELERY_BROKER_URL=amqp://guest:guest@rabbitmq
volumes:
Expand All @@ -75,6 +75,7 @@ services:
environment:
- POSTGRES_USER=backslash
- POSTGRES_DB=backslash
- POSTGRES_PASSWORD=backslash
volumes:
- "db:/var/lib/postgresql/data"
logging:
Expand Down
6 changes: 3 additions & 3 deletions integration_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def integration_url(request, timeout=30):
def _do_setup_if_needed(url):
with requests.Session() as s:
s.headers.update({"Content-type": "application/json"})
if s.post(url.add_path("api/get_app_config"), data="{}").json()["result"][
"setup_needed"
]:
resp = s.post(url.add_path("api/get_app_config"), data="{}")
resp.raise_for_status()
if resp.json()["result"]["setup_needed"]:
resp = s.post(
url.add_path("api/setup"),
data=json.dumps(
Expand Down

0 comments on commit 61d0f01

Please sign in to comment.