aboutsummaryrefslogtreecommitdiffstats
path: root/docker
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 11:55:58 +0200
commite73bd90009e11f9aa5f92aefa435b85b7022db0f (patch)
tree6c0a07e139ffdacbcf9079380b69a7120a0a53ba /docker
parentb9dab9d9dcff803b71ce42ad26578f14ed448cb3 (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>
Diffstat (limited to 'docker')
-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 2f94dfe8d..1d5097868 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -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" && \