diff options
| -rw-r--r-- | docker/healthcheck/Dockerfile | 4 | ||||
| -rw-r--r-- | functest_kubernetes/k8stest.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index fc8b3bd8..59b1941a 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -13,8 +13,8 @@ RUN apk --no-cache add --update make py-pip bash git go \ if [ "$(uname -m)" = "aarch64" ]; then sed -i "s/amd64/arm64/g" ./test/images/clusterapi-tester/pod.yaml ; fi && \ make kubectl ginkgo && \ make WHAT=test/e2e/e2e.test && \ - mv _output/bin/kubectl /usr/local/bin) && \ - rm -r /src/k8s.io/kubernetes/.git && \ + mv _output/bin/* /usr/local/bin) && \ + 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 c36863b8..dd1f66bc 100644 --- a/functest_kubernetes/k8stest.py +++ b/functest_kubernetes/k8stest.py @@ -121,8 +121,7 @@ class K8sSmokeTest(K8sTesting): if "case_name" not in kwargs: kwargs.get("case_name", 'k8s_smoke') super(K8sSmokeTest, self).__init__(**kwargs) - self.cmd = ["/src/k8s.io/kubernetes/_output/bin/e2e.test", - "-ginkgo.focus", "Guestbook.application", + self.cmd = ["e2e.test", "-ginkgo.focus", "Guestbook.application", "-kubeconfig", self.config, "--provider", "local"] @@ -132,6 +131,5 @@ class K8sConformanceTest(K8sTesting): if "case_name" not in kwargs: kwargs.get("case_name", 'k8s_conformance') super(K8sConformanceTest, self).__init__(**kwargs) - self.cmd = ['/src/k8s.io/kubernetes/_output/bin/e2e.test', - '-ginkgo.focus', 'Conformance', + self.cmd = ['e2e.test', '-ginkgo.focus', 'Conformance', '-kubeconfig', self.config, "--provider", "local"] |