Conform with git format-patch for last tempest patch 36/70636/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Sat, 1 Aug 2020 10:16:49 +0000 (12:16 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sat, 1 Aug 2020 10:18:12 +0000 (12:18 +0200)
The patch name must conform with the last commit update.

Change-Id: I493582d41080bd5d8b70d751b68af36ae61bcdc9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 911fee8cd8ab6c8e221145fbc935fd1f5c41d0a5)

docker/tempest/Create-new-server-in-test_create_backup.patch [moved from docker/tempest/Create-new-server-test_reboot_server_hard.patch with 100% similarity]
docker/tempest/Dockerfile

index 98bb87e..285d472 100644 (file)
@@ -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 \
         python-dev build-base linux-headers libffi-dev \
@@ -47,11 +47,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