From 5f62d3edf3f0d8bdd36765bb992cdcea91e28564 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 17 Aug 2016 14:21:33 +0200
Subject: CI: specific conf for CI - fix DB host

---
 .gitlab-ci.yml                              |  2 +-
 Makefile.example                            |  1 -
 example_project/local_settings.py.gitlab-ci | 12 ++++++++++++
 example_project/settings.py                 |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 example_project/local_settings.py.gitlab-ci

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efda3bde2..12757184c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ before_script:
   - apt-get install -q -y python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev
   - pip install -q -r requirements.txt
   - cp Makefile.example Makefile
-  - echo "LOGFILE = '/tmp/ishtar.log'" > example_project/local_settings.py
+  - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
 
 variables:
   POSTGRES_DB: ishtar
diff --git a/Makefile.example b/Makefile.example
index cbcbbf069..586055e90 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -48,7 +48,6 @@ test: clean
 	cd $(project); $(PYTHON) manage.py test $(apps)
 
 test_gitlab: clean
-	cat /etc/hosts;
 	cd $(project); $(PYTHON) manage.py test $(apps)
 
 pep8:
diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci
new file mode 100644
index 000000000..6c7e5fbba
--- /dev/null
+++ b/example_project/local_settings.py.gitlab-ci
@@ -0,0 +1,12 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'ishtar',
+        'USER': 'ishtar',
+        'PASSWORD': 'ishtar',
+        'HOST': 'mdillon-postgis',
+        'PORT': '5432',
+    }
+}
+
+LOGFILE = '/tmp/ishtar.log'
diff --git a/example_project/settings.py b/example_project/settings.py
index 6d984f6e6..9982d624f 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -47,7 +47,7 @@ DATABASES = {
         'NAME': 'ishtar',
         'USER': 'ishtar',
         'PASSWORD': 'ishtar',
-        'HOST': 'postgis',
+        'HOST': '127.0.0.1',
         'PORT': '5432',
     }
 }
-- 
cgit v1.2.3