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 15:25:21 +0200 |
| commit | ae4bf31b51e5dd26f17ab0ad106d77d8bb875403 (patch) | |
| tree | c5cbaf2044d24a10cb7746f90332f7ebf753624b /docker/tempest/Dockerfile | |
| parent | e6d51246d035b25416c8b3fcf297cce7cef7d611 (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>
(cherry picked from commit 719985c55d51fd7093753ae61de2328ea0543367)
Diffstat (limited to 'docker/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index ad1a2f34e..0f7822726 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -7,6 +7,7 @@ ARG RALLY_TAG=1.5.1 ARG RALLY_OPENSTACK_TAG=1.5.0 ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd +COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -34,4 +35,11 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /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 |