X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=c1e7ede034f329ab8f38de8210660e2925c8c38d;hb=5448462d7aa342c752196bb8ac17598d98a32088;hp=952e7c634b25dd85a31a347dd05044df31ceffd3;hpb=fedc26596ada9d35bb49f08259a7e5ba4cf13ae7;p=functest.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 952e7c634..c1e7ede03 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,32 +1,34 @@
-FROM alpine:3.6
+FROM alpine:3.8
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/ocata
-ARG RALLY_TAG=stable/0.9
+ARG OPENSTACK_TAG=stable/queens
+ARG PIP_TAG=18.0
 
 RUN apk --no-cache add --update \
         python libffi libssl1.0 libjpeg-turbo py-pip bash \
-        grep sed wget ca-certificates git openssh-client && \
+        grep sed wget ca-certificates git openssh-client qemu-img && \
     apk --no-cache add --virtual .build-deps --update \
         python-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/ | \
-        sed s/^requests===.*$/requests===2.13.0/ \
-        > upper-constraints.txt && \
+    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
+        sed -E /#egg=functest/d > upper-constraints.txt && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
-    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
-    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        pip==$PIP_TAG && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally && \
+        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -e git+https://git.openstack.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
+    git init /src/functest && \
+    (cd /src/functest && \
+        git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/functest && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \
-    rm -r upper-constraints.txt /src/rally/.git && \
-    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-manage db create && \
+        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        /src/functest && \
+    rm -r upper-constraints.txt /src/functest && \
+    cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \
+    bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \
+    ln -s /var/lib/xtesting /home/opnfv/functest && \
     bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
     apk del .build-deps