From b38ecccb8ab9cd1e631f89c92f6b88e420b2a1b0 Mon Sep 17 00:00:00 2001
From: "francois.cellier" <francois.cellier@orange.com>
Date: Tue, 13 Feb 2018 13:06:51 +0100
Subject: Add the moon_pythonfunctest container to perform functionnal tests

Change-Id: I2be863862ce7df408f759664b10af45416b3d712
---
 tools/moon_kubernetes/conf/moon.conf               |  2 +-
 .../templates/moon_forming_functest.yaml           | 30 ----------------------
 tools/moon_kubernetes/templates/moon_functest.yaml | 27 +++++++++++++++++++
 3 files changed, 28 insertions(+), 31 deletions(-)
 delete mode 100644 tools/moon_kubernetes/templates/moon_forming_functest.yaml
 create mode 100644 tools/moon_kubernetes/templates/moon_functest.yaml

(limited to 'tools')

diff --git a/tools/moon_kubernetes/conf/moon.conf b/tools/moon_kubernetes/conf/moon.conf
index 28ad7a8e..e242125b 100644
--- a/tools/moon_kubernetes/conf/moon.conf
+++ b/tools/moon_kubernetes/conf/moon.conf
@@ -67,7 +67,7 @@ logging:
   handlers:
     console:
       class : logging.StreamHandler
-      formatter: brief
+      formatter: custom
       level   : INFO
       stream  : ext://sys.stdout
     file:
diff --git a/tools/moon_kubernetes/templates/moon_forming_functest.yaml b/tools/moon_kubernetes/templates/moon_forming_functest.yaml
deleted file mode 100644
index 4cb2c3a0..00000000
--- a/tools/moon_kubernetes/templates/moon_forming_functest.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: functest
-  namespace: moon
-spec:
-  template:
-    metadata:
-      name: functest
-    spec:
-      containers:
-      - name: functest
-        image: wukongsun/moon_forming:dev
-        env:
-        - name: COMMAND
-          value: "functest"
-        volumeMounts:
-        - name: config-volume
-          mountPath: /etc/moon
-        - name: tests-volume
-          mountPath: /data
-      volumes:
-      - name: config-volume
-        configMap:
-          name: moon-config
-      - name: tests-volume
-        hostPath:
-          path: "{{PATH}}"
-      restartPolicy: Never
-      #backoffLimit: 4
\ No newline at end of file
diff --git a/tools/moon_kubernetes/templates/moon_functest.yaml b/tools/moon_kubernetes/templates/moon_functest.yaml
new file mode 100644
index 00000000..d70ebb96
--- /dev/null
+++ b/tools/moon_kubernetes/templates/moon_functest.yaml
@@ -0,0 +1,27 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: functest
+  namespace: moon
+spec:
+  template:
+    metadata:
+      name: functest
+    spec:
+      containers:
+      - name: functest
+        image: wukongsun/moon_python_func_test:latest
+        volumeMounts:
+        - name: config-volume
+          mountPath: /etc/moon
+        - name: tests-volume
+          mountPath: /data
+      volumes:
+      - name: config-volume
+        configMap:
+          name: moon-config
+      - name: tests-volume
+        hostPath:
+          path: "{{PATH}}"
+      restartPolicy: Never
+      #backoffLimit: 4
-- 
cgit