From fedc26596ada9d35bb49f08259a7e5ba4cf13ae7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 13 Oct 2017 22:43:30 +0200 Subject: [PATCH] Force requests===2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 --- docker/Dockerfile | 3 ++- docker/core/Dockerfile | 3 ++- docker/features/Dockerfile | 12 +++++++----- docker/parser/Dockerfile | 3 ++- docker/restapi/Dockerfile | 12 +++++++----- docker/smoke/Dockerfile | 9 ++++++--- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a764d2397..c946b7c3f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -78,7 +78,8 @@ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN 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 -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ pip install --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 04e32598e..952e7c634 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -11,7 +11,8 @@ RUN apk --no-cache add --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-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 -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1ab4142f2..ce2210edb 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -8,17 +8,19 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ python-dev python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - pip install --no-cache-dir --src /src \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + 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 && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -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 && \ npm -g install npm@latest && \ (cd /src/promise/source && npm install) && \ - rm -r thirdparty-requirements.txt && \ + rm -r upper-constraints.txt thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"] diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index b1c2981f8..d1996e914 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -12,7 +12,8 @@ RUN apk --no-cache add --update \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed /^heat-translator=/d | sed /^tosca-parser=/d | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 229f86aad..602e19c73 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 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c23ecb55d..7e12fa8b7 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -9,11 +9,14 @@ ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ + 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 && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ @@ -21,7 +24,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \ + rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"] -- 2.16.6