diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-29 13:59:04 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-29 14:01:21 +0200 |
| commit | 719985c55d51fd7093753ae61de2328ea0543367 (patch) | |
| tree | b400d047d83ecb939686c75be1badde6a413b80c /docker/core/Dockerfile | |
| parent | ebca0e28b3c11f18332c328c64d2d9c839b71aa5 (diff) | |
Apply Accept-custom-registered-endpoints
This patch is needed to verify Ceph RadosGW and then has to be
backported to Hunter (CNTT).
Tempest maybe simply updated in a few branches (Jerma, Iruya?)
depending on the side effects.
Updating Tempest in Hunter would ask for an deep update of CNTT RC.
https://github.com/openstack/tempest/commit/1d500e79156ada6bc6fdb628ed1da0efd4121f6a
Change-Id: I5cbe6374cc5cb9d4cae92ae390f5ab63f301e4cb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 1e6e8ae95..6e3d04bb5 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -3,6 +3,7 @@ FROM alpine:3.10 ARG BRANCH=stable/jerma ARG OPENSTACK_TAG=stable/train +COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.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 mailcap && \ @@ -34,4 +35,11 @@ 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/Accept-custom-registered-endpoints.patch && \ + git commit -a -m "Apply Accept-custom-registered-endpoints" && \ + rm ~/.gitconfig) && \ + rm /tmp/Accept-custom-registered-endpoints.patch && \ apk del .build-deps |