X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=747750d970cc1bf91719e7441ea4c2cbdbc2ce71;hb=fbac166c0010ac15835ba37260b94e3c705e339d;hp=c6907a146e0441054ec660ffc5edc74e3fd54841;hpb=bd28b49aa1ba7d8127144c2a3eef0536d9bdc606;p=functest-kubernetes.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c6907a14..747750d9 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,26 +1,32 @@
-FROM golang:1.12-alpine3.10
+FROM golang:1.13-alpine3.10
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/jerma
+ARG OPENSTACK_TAG=stable/train
+ARG OPNFV_TAG=stable/jerma
 
-RUN apk --no-cache add --update python3 bash git grep libffi openssl && \
+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
+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 && \
     git init /src/functest-kubernetes && \
     (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) && \
+    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 && \
     apk del .build-deps
 COPY logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/logging.ini
 CMD ["run_tests", "-t", "all"]