Conform with git format-patch for last tempest patch 24/70624/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 09:55:58 +0000 (11:55 +0200)
The patch name must conform with the last commit update.

Change-Id: I493582d41080bd5d8b70d751b68af36ae61bcdc9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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 2f94dfe..1d50978 100644 (file)
@@ -4,7 +4,7 @@ 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-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 py3-wheel libffi openssl libjpeg-turbo py3-pip bash \
         grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \
@@ -34,12 +34,12 @@ RUN apk --no-cache add --update \
     (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-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 -r /src/requirements/.git /src/functest/.git \
         /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \
-        /tmp/Create-new-server-test_reboot_server_hard.patch && \
+        /tmp/Create-new-server-in-test_create_backup.patch && \
     cp /src/functest/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
     cp /src/functest/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
     bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \