summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-10 09:17:57 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-10 11:14:52 +0100
commit16e2fcb7ae7a2031832cdfab2528b5f746186728 (patch)
treeae19e8993a2f48e40ad9362f88a84e96a55b12a0
parent7cfd50c83b034af86b484250aca3f61927275b87 (diff)
Publish Junit files and fix Conformance regex
It fixes Conformance to [Conformance] and add the skips test regex. It now conforms with Kubernetes Certification (see Sunobuoy) Change-Id: Ic25bb72c839810cf41668a3a8b86579a3fd59629 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit fd130c880d4d185153efe3e3e0aa24c95052c320)
-rw-r--r--functest_kubernetes/k8stest.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 59eb999e..76693e91 100644
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -33,6 +33,8 @@ class K8sTesting(testcase.TestCase):
def __init__(self, **kwargs):
super(K8sTesting, self).__init__(**kwargs)
self.cmd = []
+ self.res_dir = "/home/opnfv/functest/results/{}".format(
+ self.case_name)
self.result = 0
self.start_time = 0
self.stop_time = 0
@@ -120,7 +122,7 @@ class K8sSmokeTest(K8sTesting):
super(K8sSmokeTest, self).__init__(**kwargs)
self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application',
'-ginkgo.noColor', '-kubeconfig', self.config,
- '--provider', 'local']
+ '-provider', 'local', '-report-dir', self.res_dir]
class K8sConformanceTest(K8sTesting):
@@ -129,6 +131,8 @@ class K8sConformanceTest(K8sTesting):
if "case_name" not in kwargs:
kwargs.get("case_name", 'k8s_conformance')
super(K8sConformanceTest, self).__init__(**kwargs)
- self.cmd = ['e2e.test', '-ginkgo.focus', 'Conformance',
- '-ginkgo.noColor', '-kubeconfig', self.config,
- '--provider', 'local']
+ self.cmd = [
+ 'e2e.test', '-ginkgo.focus', r'\[Conformance\]', '-ginkgo.noColor',
+ '-ginkgo.skip', r'Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]',
+ '-kubeconfig', self.config, '-provider', 'local',
+ '-report-dir', self.res_dir]