From a09b4d33818f1b3fd3836a99cbb742fa84caecb4 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kristian@bohemians.org>
Date: Wed, 13 Apr 2016 21:17:28 +0200
Subject: Working test! It's amazing!

Never been so happy to see a single switch in the nms.

Missing: Varnish and collectors and better deplist.

Also: this is mainly _test_ stuff, not meant for development OR production.
---
 build/test/db-test.Dockerfile |  1 +
 build/test/playbook-test.yml  | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'build/test')

diff --git a/build/test/db-test.Dockerfile b/build/test/db-test.Dockerfile
index cd6161e..a182040 100644
--- a/build/test/db-test.Dockerfile
+++ b/build/test/db-test.Dockerfile
@@ -5,5 +5,6 @@ RUN cat /pg_hba.tail >> /etc/postgresql/9.4/main/pg_hba.conf
 RUN service postgresql start && su postgres -c "psql --command=\"CREATE ROLE nms PASSWORD 'risbrod' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" && su postgres -c "createdb -O nms nms" && service postgresql stop
 ADD schema.sql /schema.sql
 RUN service postgresql start && su postgres -c "cat /schema.sql | psql nms" && service postgresql stop
+RUN echo "listen_addresses = '*'" >> /etc/postgresql/9.4/main/postgresql.conf
 CMD pg_ctlcluster --foreground 9.4 main start
 EXPOSE 5432
diff --git a/build/test/playbook-test.yml b/build/test/playbook-test.yml
index 2794b21..4a04328 100644
--- a/build/test/playbook-test.yml
+++ b/build/test/playbook-test.yml
@@ -4,6 +4,7 @@
   tasks:
   - name: make db-test
     docker_image:
+        nocache: true
         state: build
         name: nms-db-test
         docker_api_version: 1.18
@@ -11,6 +12,7 @@
         path: "src/tgnms/build/"
   - name: make front-test
     docker_image:
+        nocache: true
         state: build
         name: nms-front-test
         docker_api_version: 1.18
@@ -23,6 +25,18 @@
         docker_api_version: 1.18
         dockerfile: test/collector-test.Dockerfile
         path: "src/tgnms/build/"
+  - name: stop db
+    docker:
+        name: nms-db
+        state: stopped
+        image: nms-db-test
+        docker_api_version: 1.18
+  - name: stop front 
+    docker:
+        name: nms-front
+        state: stopped
+        image: nms-front-test
+        docker_api_version: 1.18
   - name: start db
     docker: 
         name: nms-db
@@ -36,7 +50,7 @@
         name: nms-front
         image: nms-front-test
         docker_api_version: 1.18
-        state: reloaded
+        state: started
         net: bridge
         links:
         - "nms-db:db"
-- 
cgit v1.2.3