From ae4bf31b51e5dd26f17ab0ad106d77d8bb875403 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 29 Mar 2020 13:59:04 +0200 Subject: Apply Accept-custom-registered-endpoints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 719985c55d51fd7093753ae61de2328ea0543367) --- docker/smoke/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/smoke') 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 && \ -- cgit