X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=5d414463db3e74fc110c9787cd1e7a21dc143b4c;hb=refs%2Fchanges%2F00%2F67700%2F1;hp=704f5d945c45ee79d3a2e3bfdd8e31eb9850d9fd;hpb=b988ac0646bc4d58144c8e86dc178b099a3d3ed3;p=functest.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 704f5d945..5d414463d 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,30 +1,35 @@
-FROM alpine:3.6
+FROM alpine:3.9
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
-ARG OS_FAULTS_TAG=0.1.16
+ARG OPENSTACK_TAG=master
+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 && \
+        python libffi openssl libjpeg-turbo py-pip bash \
+        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 \
-        > upper-constraints.txt && \
-    git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \
-    (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
-    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/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
-    update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        /src/os-faults && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+    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 && \
+    pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \
+        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
+        pip==$PIP_TAG && \
+    pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \
+        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
+        -e git+https://opendev.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.opnfv.txt \
+        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         /src/functest && \
-    rm -r upper-constraints.txt /src/functest /src/os-faults/.git && \
+    rm -r upper-constraints.opnfv.txt /src/functest && \
+    cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \
+    cp /usr/lib/python2.7/site-packages/functest/ci/logging.debug.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