From 2b95c0ceb0d5f14c66a35a6ed7368b520a0a77ee Mon Sep 17 00:00:00 2001
From: djkonro <konraddjimeli@gmail.com>
Date: Sun, 4 Feb 2018 22:13:01 +0100
Subject: Add Kubernetes conformance tests

JIRA: FUNCTEST-905

Change-Id: I2f70884811431f21fe98bb6a989a9172f3612a64
Signed-off-by: djkonro <konraddjimeli@gmail.com>
---
 docker/Dockerfile     |  3 ++-
 docker/logging.ini    | 28 +++++++++++++++++++++++++---
 docker/testcases.yaml | 16 ++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9aa7f84e..d860bb93 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,7 +9,8 @@ RUN apk --no-cache add --update make bash go \
     (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \
     (cd /src/k8s.io/kubernetes && \
         make kubectl ginkgo && \
-        make WHAT=test/e2e/e2e.test) && \
+        make WHAT=test/e2e/e2e.test && \
+        mv _output/bin/kubectl /usr/local/bin) && \
     git clone https://gerrit.opnfv.org/gerrit/functest-kubernetes /src/functest-kubernetes && \
     (cd /src/functest-kubernetes && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
     pip install /src/functest-kubernetes && \
diff --git a/docker/logging.ini b/docker/logging.ini
index 594de7af..36e0bb49 100644
--- a/docker/logging.ini
+++ b/docker/logging.ini
@@ -1,8 +1,8 @@
 [loggers]
-keys=root,functest,functest_kubernetes
+keys=root,functest,functest_kubernetes,k8s_smoke,k8s_conformance
 
 [handlers]
-keys=console,wconsole,file,null
+keys=console,wconsole,file,null,k8s_smoke_logfile,k8s_conformance_logfile
 
 [formatters]
 keys=standard
@@ -13,7 +13,7 @@ handlers=null
 
 [logger_functest_kubernetes]
 level=NOTSET
-handlers=console
+handlers=console,file
 qualname=functest_kubernetes
 
 [logger_functest]
@@ -21,6 +21,16 @@ level=NOTSET
 handlers=console
 qualname=functest
 
+[logger_k8s_smoke]
+level=NOTSET
+handlers=k8s_smoke_logfile
+qualname=k8s_smoke
+
+[logger_k8s_conformance]
+level=NOTSET
+handlers=k8s_conformance_logfile
+qualname=k8s_conformance
+
 [handler_null]
 class=NullHandler
 level=NOTSET
@@ -45,6 +55,18 @@ level=DEBUG
 formatter=standard
 args=("/home/opnfv/functest/results/functest-kubernetes.log",)
 
+[handler_k8s_smoke_logfile]
+class=FileHandler
+level=DEBUG
+formatter=standard
+args=("/home/opnfv/functest/results/k8s_smoke.log",)
+
+[handler_k8s_conformance_logfile]
+class=FileHandler
+level=DEBUG
+formatter=standard
+args=("/home/opnfv/functest/results/k8s_conformance.log",)
+
 [formatter_standard]
 format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
 datefmt=
diff --git a/docker/testcases.yaml b/docker/testcases.yaml
index 2eed64c1..493eb8b7 100644
--- a/docker/testcases.yaml
+++ b/docker/testcases.yaml
@@ -22,3 +22,19 @@ tiers:
                 run:
                     module: 'functest_kubernetes.k8stest'
                     class: 'K8sSmokeTest'
+
+            -
+                case_name: k8s_conformance
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Conformance Tests are expect to pass on any Kubernetes
+                    cluster, this tests are necessary demonstrate conformance
+                    of the Kubernetes deployment.
+                dependencies:
+                    installer: '(compass)|(joid)'
+                    scenario: 'k8-*'
+                run:
+                    module: 'functest_kubernetes.k8stest'
+                    class: 'K8sConformanceTest'
-- 
cgit 1.2.3-korg