Conform with git format-patch for last tempest patch 30/70630/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Sat, 1 Aug 2020 09:55:58 +0000 (11:55 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sat, 1 Aug 2020 10:03:34 +0000 (12:03 +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 e73bd90009e11f9aa5f92aefa435b85b7022db0f)

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

index 1077ba2..a42652b 100644 (file)
@@ -7,7 +7,7 @@ COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endp
 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 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 \
@@ -52,12 +52,12 @@ RUN apk --no-cache add --update \
         patch -p1 < /tmp/Accept-custom-registered-endpoints.patch && \
         patch -p1 < /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch && \
         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/Accept-custom-registered-endpoints.patch \
         /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch \
         /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