From fc12d86279008546d67cac6fcc689d8fe784adc1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 23 Feb 2015 15:10:22 +0000 Subject: [PATCH] Drone should pass in relevant settings instead of a RUNNING_IN_DRONE flag --- .drone.yml | 3 ++- wagtail/tests/settings.py | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 965578e298..c9af876846 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,7 @@ image: kaedroho/django-base env: - - RUNNING_IN_DRONE=yes + - DATABASE_HOST=postgres + - ELASTICSEARCH_URL=http://elasticsearch:9200/ script: - pip3.4 install mock python-dateutil pytz elasticsearch - python3.4 setup.py install diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 72f0b31844..8164b38ea0 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -16,12 +16,11 @@ DATABASES = { 'TEST_NAME': os.environ.get('DATABASE_NAME', 'test_wagtaildemo'), 'USER': os.environ.get('DATABASE_USER', 'postgres'), 'PASSWORD': os.environ.get('DATABASE_PASS', None), + 'HOST': os.environ.get('DATABASE_HOST', None), + 'PORT': os.environ.get('DATABASE_PORT', None), } } -if os.environ.get('RUNNING_IN_DRONE', False) == 'yes': - DATABASES['default']['HOST'] = 'postgres' - SECRET_KEY = 'not needed' @@ -127,8 +126,8 @@ try: } # Check if we're running in Drone - if os.environ.get('RUNNING_IN_DRONE', False) == 'yes': - WAGTAILSEARCH_BACKENDS['elasticsearch']['URLS'] = ['http://elasticsearch:9200/'] + if 'ELASTICSEARCH_URL' in os.environ: + WAGTAILSEARCH_BACKENDS['elasticsearch']['URLS'] = [os.environ['ELASTICSEARCH_URL']] except ImportError: pass