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/smoke/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/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 580da5d44..c02e57a86 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -15,7 +15,7 @@ RUN apk --no-cache add --update libxml2 libxslt libpcre16 libpcre32 && \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev pcre-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ - sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ + sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ |