aboutsummaryrefslogtreecommitdiffstats
path: root/docker/tempest/Dockerfile
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2020-07-02 17:29:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-07-02 17:29:45 +0000
commit9ad273a42ef84a9ec9b54aa26a1d6767c6cb7eef (patch)
treedad18089a906039d46fb8c836fbc73991b199d9d /docker/tempest/Dockerfile
parentf0e68cda82954e9e787759faf2f2598b8abffaa5 (diff)
parenta6c285639916773a6ad9789d5983f32b54ae3c5f (diff)
Merge "Apply "object storage: fix and cleanup header checks"" into stable/hunter
Diffstat (limited to 'docker/tempest/Dockerfile')
-rw-r--r--docker/tempest/Dockerfile7
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index f3d9c03ec..2981ce723 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -8,6 +8,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 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 \
@@ -43,9 +44,11 @@ RUN apk --no-cache add --virtual .build-deps --update \
git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \
git config --global user.name "Functest" && \
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 && \
git commit -a -m "Backport critical bugfixes" && \
rm ~/.gitconfig) && \
- rm /tmp/Accept-custom-registered-endpoints.patch && \
- rm /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch && \
+ 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 && \
apk del .build-deps