From b29798dcfa8320e3a070aeb360adbdf7b1dcae75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 1 Aug 2020 11:55:58 +0200 Subject: [PATCH] Conform with git format-patch for last tempest patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The patch name must conform with the last commit update. Change-Id: I493582d41080bd5d8b70d751b68af36ae61bcdc9 Signed-off-by: Cédric Ollivier (cherry picked from commit e73bd90009e11f9aa5f92aefa435b85b7022db0f) --- ...ver_hard.patch => Create-new-server-in-test_create_backup.patch} | 0 docker/core/Dockerfile | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename docker/core/{Create-new-server-test_reboot_server_hard.patch => Create-new-server-in-test_create_backup.patch} (100%) diff --git a/docker/core/Create-new-server-test_reboot_server_hard.patch b/docker/core/Create-new-server-in-test_create_backup.patch similarity index 100% rename from docker/core/Create-new-server-test_reboot_server_hard.patch rename to docker/core/Create-new-server-in-test_create_backup.patch diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e13bd50d1..3f7f16a55 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=stable/ussuri COPY object-storage-fix-and-cleanup-header-checks.patch /tmp/object-storage-fix-and-cleanup-header-checks.patch COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch -COPY Create-new-server-test_reboot_server_hard.patch /tmp/Create-new-server-test_reboot_server_hard.patch +COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \ @@ -45,10 +45,10 @@ RUN apk --no-cache add --update \ git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \ git config --global user.name "Functest" && \ patch -p1 < /tmp/object-storage-fix-and-cleanup-header-checks.patch && \ - patch -p1 < /tmp/Create-new-server-test_reboot_server_hard.patch && \ + patch -p1 < /tmp/Create-new-server-in-test_create_backup.patch && \ git commit -a -m "Backport critical bugfixes" && \ rm ~/.gitconfig) && \ sed -i -E /#egg=tempest/d /src/functest/upper-constraints.txt && \ rm tmp/object-storage-fix-and-cleanup-header-checks.patch \ - /tmp/Create-new-server-test_reboot_server_hard.patch && \ + /tmp/Create-new-server-in-test_create_backup.patch && \ apk del .build-deps -- 2.16.6