Update to Xtesting 0.83

[functest.git] / docker / healthcheck / Dockerfile

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index e78d81c..1876b5e 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,20 +1,31 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
+ARG TEMPEST_HORIZON_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN 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 && \
-    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
-        sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-        -rthirdparty-requirements.txt && \
-    git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
-    (cd /src/odl_test && git checkout $ODL_TAG) && \
-    rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \
-        upper-constraints.opnfv.txt
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+RUN apk --no-cache add --virtual .build-deps --update \
+        python3-dev build-base linux-headers libffi-dev openssl-dev && \
+    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 && \
+    git init /src/tempest-horizon && \
+    (cd /src/tempest-horizon && \
+        git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/tempest-horizon/ && \
+    pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+        /src/tempest-horizon -rthirdparty-requirements.txt && \
+    git init /src/odl_test && \
+    (cd /src/odl_test && \
+        git fetch --tags https://git.opendaylight.org/gerrit/integration/test $ODL_TAG && \
+        git checkout FETCH_HEAD) && \
+    rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt \
+        upper-constraints.txt upper-constraints.opnfv.txt && \
+    apk del .build-deps
+COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]