Disable log dump

It avoids dumping logs at the end which requires gcloud configured (CI).
Then it partially reverts "Keep kubernetes sources" [1].

It now dumps e2e.test output in e2e.log as sonobuoy [2].

[1] https://gerrit.opnfv.org/gerrit/68106
[2] https://raw.githubusercontent.com/cncf/k8s-conformance/master/v1.15/kubeadm/e2e.log

Change-Id: I400e1cf92a8540eba3d40db1ed4237628921efe6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit d1d3feacdbf061cf4115ceeadcb71d2142971757)

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 82c297a..304412a 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -14,7 +14,7 @@ RUN apk --no-cache add --update make py-pip bash git \
         make kubectl ginkgo && \
         make WHAT=test/e2e/e2e.test && \
         mv _output/bin/* /usr/local/bin) && \
-    rm -r /src/k8s.io/kubernetes/.git /src/k8s.io/kubernetes/_output && \
+    rm -r /src/k8s.io && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index c78959c..8a31d6c 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -46,7 +46,10 @@ class K8sTesting(testcase.TestCase):
 
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
-        output = process.stdout.read().decode("utf-8")
+        boutput = process.stdout.read()
+        with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput:
+            foutput.write(boutput)
+        output = boutput.decode("utf-8")
         if ('Error loading client' in output or
                 'Unexpected error' in output):
             raise Exception(output)
@@ -122,7 +125,8 @@ class K8sSmokeTest(K8sTesting):
         super(K8sSmokeTest, self).__init__(**kwargs)
         self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application',
                     '-ginkgo.noColor', '-kubeconfig', self.config,
-                    '-provider', 'local', '-report-dir', self.res_dir]
+                    '-provider', 'local', '-report-dir', self.res_dir,
+                    '-disable-log-dump', 'true']
 
 
 class K8sConformanceTest(K8sTesting):
@@ -135,4 +139,4 @@ class K8sConformanceTest(K8sTesting):
             '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]
+            '-report-dir', self.res_dir, '-disable-log-dump', 'true']

diff --git a/functest_kubernetes/test_k8stest.py b/functest_kubernetes/test_k8stest.py
index b03bb6d..a94fdf8 100644 (file)
--- a/functest_kubernetes/test_k8stest.py
+++ b/functest_kubernetes/test_k8stest.py
@@ -64,6 +64,7 @@ class K8sTests(unittest.TestCase):
             mock_logger.exception.assert_called_with(
                 "Error with running kubetest:")
 
+    @mock.patch('six.moves.builtins.open', mock.mock_open())
     @mock.patch('functest_kubernetes.k8stest.os.path.isfile')
     @mock.patch('functest_kubernetes.k8stest.subprocess.Popen')
     def test_run(self, mock_open, mock_isfile):