From 911fee8cd8ab6c8e221145fbc935fd1f5c41d0a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 1 Aug 2020 12:16:49 +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 --- ...ver_hard.patch => Create-new-server-in-test_create_backup.patch} | 0 docker/tempest/Dockerfile | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename docker/tempest/{Create-new-server-test_reboot_server_hard.patch => Create-new-server-in-test_create_backup.patch} (100%) diff --git a/docker/tempest/Create-new-server-test_reboot_server_hard.patch b/docker/tempest/Create-new-server-in-test_create_backup.patch similarity index 100% rename from docker/tempest/Create-new-server-test_reboot_server_hard.patch rename to docker/tempest/Create-new-server-in-test_create_backup.patch diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index ccd30c9c3..52673a468 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -9,7 +9,7 @@ ARG RALLY_OPENSTACK_TAG=1.5.0 COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch COPY Fixes-race-condition-in-test_add_remove_fixed_ip.patch /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch COPY object-storage-fix-and-cleanup-header-checks.patch /tmp/object-storage-fix-and-cleanup-header-checks.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 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch RUN apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ @@ -45,11 +45,11 @@ RUN apk --no-cache add --virtual .build-deps --update \ patch -p1 < /tmp/Accept-custom-registered-endpoints.patch && \ patch -p1 < /tmp/object-storage-fix-and-cleanup-header-checks.patch && \ patch -p1 < /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.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) && \ rm /tmp/Accept-custom-registered-endpoints.patch \ /tmp/object-storage-fix-and-cleanup-header-checks.patch \ /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.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