X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=ab20e74c3025df90a6609392cd5ccf970c8a188c;hb=refs%2Fchanges%2F57%2F71457%2F3;hp=ecbbe32d36436803623039c2ab3a0c9e2a1391f2;hpb=ab0b14d3e2f2aceb55a97de1dd27bf3064963598;p=functest-kubernetes.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ecbbe32d..ab20e74c 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,9 +1,12 @@
-FROM golang:1.12-alpine3.10
+FROM alpine:3.10
 
 ARG BRANCH=stable/jerma
 ARG OPENSTACK_TAG=stable/train
 ARG OPNFV_TAG=stable/jerma
 
+COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
+COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
+COPY Allow-offline-testing-in-PodWithClusterIPSvc.patch /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch
 RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base libffi-dev openssl-dev && \
@@ -11,16 +14,22 @@ RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap &&
     (cd /src/functest-kubernetes && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \
         git checkout FETCH_HEAD) && \
-    pip3 install \
+    pip3 install --no-cache-dir --src /src \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
         -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         /src/functest-kubernetes && \
-    rm -rf /src/functest-kubernetes && \
+    (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
+    (cd /usr/lib/python3.7/site-packages/xrally_kubernetes/ && \
+        patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
+        patch -p2 < /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch) && \
+    rm -rf /src/functest-kubernetes /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \
     bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \
     ln -s /var/lib/xtesting /home/opnfv/functest && \
     mkdir -p /etc/rally && \
     printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
     mkdir -p /var/lib/rally/database && rally db create && \
+    rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch && \
     apk del .build-deps
 COPY logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/logging.ini
+COPY logging.debug.ini /usr/lib/python3.7/site-packages/xtesting/ci/logging.debug.ini
 CMD ["run_tests", "-t", "all"]