Add logging.ini for functest_kubernetes

[functest-kubernetes.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 004409f..9aa7f84 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,19 @@
 FROM opnfv/functest-core
 
+ARG BRANCH=master
 ARG K8S_TAG=v1.7.3
 
 RUN apk --no-cache add --update make bash go \
         grep rsync linux-headers musl-dev findutils && \
     git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \
     (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \
-    (cd /src/k8s.io/kubernetes && make WHAT=test/e2e/e2e.test) && \
-    rm -rf /src/k8s.io/kubernetes/.git
+    (cd /src/k8s.io/kubernetes && \
+        make kubectl ginkgo && \
+        make WHAT=test/e2e/e2e.test) && \
+    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 && \
+    rm -rf /src/k8s.io/kubernetes/.git /src/functest-kubernetes
+COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
+COPY logging.ini /usr/lib/python2.7/site-packages/functest/ci/logging.ini
+CMD ["run_tests", "-t", "all"]