Add BRANCH as Docker build arg

[functest.git] / docker / features / Dockerfile

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index af2a1eb..adcb545 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,22 +1,28 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/ocata
-ARG DOMINO_TAG=master
+ARG OPENSTACK_TAG=stable/pike
+ARG FDS_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm && \
+RUN apk --no-cache add --update nodejs nodejs-npm python3 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 \
+        python-dev python3-dev build-base linux-headers libffi-dev \
+        openssl-dev libjpeg-turbo-dev && \
+    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
+        > upper-constraints.txt && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -rthirdparty-requirements.txt && \
+    git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
+    python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        doctor-tests && \
     npm -g install npm@latest && \
-    (cd /src/promise/source && npm install) && \
-    git clone --depth 1 -b $DOMINO_TAG https://gerrit.opnfv.org/gerrit/domino /src/domino && \
-    rm -r thirdparty-requirements.txt /src/domino/.git && \
+    # the next line must be uncommented as soon as promise is synced with pike
+    # (cd /src/promise/source && npm install) && \
+    rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
     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"]