diff options
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c741db03b..2715cce39 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,7 +4,6 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch -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 \ @@ -34,15 +33,8 @@ RUN apk -U upgrade && \ (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 \ - /tmp/Create-new-server-in-test_create_backup.patch && \ + /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ mkdir -p /etc/xtesting && \ cp /src/functest/functest/ci/logging.ini /etc/xtesting/ && \ cp /src/functest/functest/ci/logging.debug.ini /etc/xtesting/ && \ |