diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-01 12:16:49 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-01 12:18:12 +0200 |
| commit | 9caa6673542fdd2bda72fe052a37b9788745000f (patch) | |
| tree | c303b6d7145894552049b4adeba6e35db086ec42 /docker | |
| parent | 7e43c0878a34675bb42c51a38346606181dc9aee (diff) | |
Conform with git format-patch for last tempest patch
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)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Create-new-server-in-test_create_backup.patch (renamed from docker/tempest/Create-new-server-test_reboot_server_hard.patch) | 0 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/tempest/Create-new-server-test_reboot_server_hard.patch b/docker/tempest/Create-new-server-in-test_create_backup.patch index 1b86b0fc5..1b86b0fc5 100644 --- a/docker/tempest/Create-new-server-test_reboot_server_hard.patch +++ b/docker/tempest/Create-new-server-in-test_create_backup.patch diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 98bb87eb7..285d472dd 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 \ 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 |