X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Ffeatures%2FDockerfile;h=3fc6f1d7e3abb2525f906dfc27a019d4c521c8bd;hb=22b978b7a3790ec393024152e0d8f2254635e81e;hp=e1214c1e817f4c66102036415d548075021a2a76;hpb=955cce803147e194b03c4950d66aeac273b94759;p=functest.git

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index e1214c1e8..3fc6f1d7e 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,20 +1,22 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/ocata
+ARG OPENSTACK_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm && \
+RUN apk --no-cache add --update sshpass && \
     apk --no-cache add --virtual .build-deps --update \
-        python-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev git && \
-    pip install --no-cache-dir --src /src \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        python3-dev build-base linux-headers libffi-dev \
+        openssl-dev libjpeg-turbo-dev file && \
+    wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
+    sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
+    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
+    sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
+    pip3 install --no-cache-dir --src /src -cupper-constraints.txt \
+        -cupper-constraints.opnfv.txt \
         -rthirdparty-requirements.txt && \
-    npm -g install npm@latest && \
-    (cd /src/promise/source && npm install) && \
-    rm -r thirdparty-requirements.txt && \
+    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt && \
     apk del .build-deps
-COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
-CMD ["bash","-c","prepare_env start && run_tests -t all"]
+COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
+CMD ["run_tests", "-t", "all"]