X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=9d286bb71123703a95bef8589ff6b044182a5950;hb=f5d06afcc5b361c479892839722ce276ed245198;hp=2b68d0e103d1f5ffe682e66d70be6873200c3c61;hpb=e48f491529032b8dd009843976545febaddb0b7b;p=functest-kubernetes.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 2b68d0e1..9d286bb7 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,20 +1,39 @@
-FROM golang:alpine3.8
+FROM golang:1.14-alpine3.12
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
 ARG OPNFV_TAG=master
 
-RUN apk --no-cache add --update python py-pip bash git grep && \
+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 py3-pip py3-wheel bash git grep libffi openssl mailcap && \
+    apk --no-cache add --virtual .build-deps --update \
+        python3-dev build-base libffi-dev openssl-dev && \
+    apk --no-cache add --update --upgrade py3-distlib \
+        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
+    git init /src/requirements && \
+    (cd /src/requirements && \
+        git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
+        git checkout FETCH_HEAD) && \
     git init /src/functest-kubernetes && \
     (cd /src/functest-kubernetes && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \
         git checkout FETCH_HEAD) && \
-    pip install \
+    pip3 install --no-cache-dir --src /src \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -c/src/requirements/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.8/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
-COPY logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.ini
+    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 -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
+    apk del .build-deps
+COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini
+COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini
 CMD ["run_tests", "-t", "all"]