aboutsummaryrefslogtreecommitdiffstats
path: root/docker/core
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-01 11:55:58 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-01 12:03:34 +0200
commit0501c313aafb6ca43a3a7029740054fa0fb71430 (patch)
treea5c177184820ddaf318c8f763f615f6d8f9436ee /docker/core
parentaa2f20598c42a4235bb85b6a8f9dc262bb791465 (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 e73bd90009e11f9aa5f92aefa435b85b7022db0f)
Diffstat (limited to 'docker/core')
-rw-r--r--docker/core/Create-new-server-in-test_create_backup.patch (renamed from docker/core/Create-new-server-test_reboot_server_hard.patch)0
-rw-r--r--docker/core/Dockerfile6
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Create-new-server-test_reboot_server_hard.patch b/docker/core/Create-new-server-in-test_create_backup.patch
index 1b86b0fc5..1b86b0fc5 100644
--- a/docker/core/Create-new-server-test_reboot_server_hard.patch
+++ b/docker/core/Create-new-server-in-test_create_backup.patch
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 1077ba2a6..a42652be7 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -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