From e34f8967502593f3bfec26f95a1c349ac786cb3c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 13 Oct 2017 22:43:30 +0200 Subject: Force requests===2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It overrides OpenStack's upper-constraints to allow rally to work vs a self signed certificate. It will be pushed to the right OpenStack project after the patch is confirmed by CI. Euphrates will be released too early regarding the full upstream cycle required. JIRA: FUNCTEST-876 Change-Id: I52656f8b98fced103f13dde039082806636c680a Signed-off-by: Cédric Ollivier (cherry picked from commit fedc26596ada9d35bb49f08259a7e5ba4cf13ae7) --- docker/restapi/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'docker/restapi/Dockerfile') diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index aba4b6ed7..bd3cdebbb 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -15,15 +15,17 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ python-dev python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + sed s/^requests===.*$/requests===2.13.0/ \ + > upper-constraints.txt && \ git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \ (cd src/refstack-client && git checkout $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ - pip install --no-cache-dir --src /src \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -e/src/refstack-client -rthirdparty-requirements.txt && \ - python3 -m pip install --no-cache-dir --src /src \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ doctor-tests && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ @@ -35,7 +37,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ (cd /src/promise/source && npm install) && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ npm -g install npm@latest && \ - rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ + rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ /src/fds/.git /src/vims-test/.git && \ apk del .build-deps EXPOSE 5000 -- cgit 1.2.3-korg