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:41:59 +0200 |
| commit | d41e1ebed19fc15512163377063a38ba365eba53 (patch) | |
| tree | b1934a41519d591e11d5417416f45cda494276e4 /docker/core/Dockerfile | |
| parent | e5d84ea625eeda63f5a1694d166e5f523baf51f3 (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>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 7ed9b81ab..18211dd51 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -3,6 +3,7 @@ FROM alpine:3.11 ARG BRANCH=stable/kali ARG OPENSTACK_TAG=stable/ussuri +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 --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ @@ -39,4 +40,12 @@ RUN apk --no-cache add --update \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'\n" > /etc/rally/rally.conf && \ printf "\n[openstack]\nneutron_bind_l2_agent_types = Open vSwitch agent,Linux bridge agent,OVN Controller Gateway agent\n" >> /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ + (cd /src/tempest && \ + git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \ + git config --global user.name "Functest" && \ + patch -p1 < /tmp/object-storage-fix-and-cleanup-header-checks.patch && \ + git commit -a -m "Backport critical bugfixes" && \ + rm ~/.gitconfig) && \ + sed -i -E /#egg=tempest/d /src/functest/upper-constraints.txt && \ + rm tmp/object-storage-fix-and-cleanup-header-checks.patch && \ apk del .build-deps |