diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-25 11:28:12 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-01 13:46:19 +0200 |
| commit | a6c285639916773a6ad9789d5983f32b54ae3c5f (patch) | |
| tree | cb08ad96210e793df03aa7b90b9b2fc2daefedf2 /docker/tempest/Dockerfile | |
| parent | 86fed3e54ff0718745c5c6492bff30ead84ad223 (diff) | |
Apply "object storage: fix and cleanup header checks"
It was highlighted as a fix needed by CNTT during the CNTT RC field
trial [1].
[1] http://testresults.opnfv.org/functest/field_trial/
Change-Id: I7e85c952d2a5c9ce5006aa7034eaca6cd1f528ea
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit d8326132a9049c063a95e40c46f708387713a9de)
Diffstat (limited to 'docker/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index e268c435c..6a3a34f03 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 \ @@ -42,9 +43,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 |