diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 22:43:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 23:31:07 +0200 |
| commit | fedc26596ada9d35bb49f08259a7e5ba4cf13ae7 (patch) | |
| tree | ce065ebad410c91e305f0714562ee3a576c2e109 /docker/smoke | |
| parent | 64f7b173a8466e5482adc1f938be9a463b9b1257 (diff) | |
Force requests===2.13.0
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
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"] |