X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=d955920f9ef76c14b2489335f10d4b6b91d68d63;hb=61138bfec980625bec6c219b9e27685c281e5965;hp=27e2fe1d2fa3e4d1f3d8cd51e006165cb5c81b4b;hpb=961b940c796871e40146b90cf19b48390310dd59;p=functest.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 27e2fe1d2..d955920f9 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,15 +1,19 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=refs/changes/53/735453/1
+ARG OPENSTACK_TAG=master
 
 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
-RUN apk --no-cache add --update \
-        python3 libffi openssl libjpeg-turbo py3-pip bash \
+COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch
+RUN apk -U upgrade && \
+    apk --no-cache add --update \
+        python3 py3-wheel libffi openssl libjpeg-turbo py3-pip bash \
         grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev && \
+        openssl-dev libjpeg-turbo-dev rust cargo && \
+    apk --no-cache add --update py3-distlib\>=0.3.1 \
+        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
     git init /src/requirements && \
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
@@ -18,19 +22,31 @@ RUN apk --no-cache add --update \
     (cd /src/functest && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
         git checkout FETCH_HEAD) && \
+    sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
+    sed -i -E /^six=/d /src/requirements/upper-constraints.txt && \
+    sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \
+    sed -i -E /^packaging=/d /src/requirements/upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
     sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
-    sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
-    pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
+    pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
         -e /src/requirements && \
     update-requirements -s --source /src/requirements /src/functest && \
-    pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
+    pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
         -e /src/functest && \
     (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
+    sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \
+    sed -i -E /#egg=tempest/d /src/functest/upper-constraints.txt && \
+    (cd /src/tempest && \
+        git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \
+        git config --global user.name "Functest" && \
+        patch -p1 < /tmp/Create-new-server-in-test_create_backup.patch && \
+        git commit -a -m "Backport critical bugfixes" && \
+        rm ~/.gitconfig) && \
     rm -r /src/requirements/.git /src/functest/.git \
-        /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \
-    cp /src/functest/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
-    cp /src/functest/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
+        /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \
+        /tmp/Create-new-server-in-test_create_backup.patch && \
+    cp /src/functest/functest/ci/logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/ && \
+    cp /src/functest/functest/ci/logging.debug.ini /usr/lib/python3.9/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" && \