From bde3bcb27574b5ace25021de5ed2303161995cc9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 7 Jul 2017 20:09:41 +0200 Subject: Add upper-constraints.txt for Functest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It completes OpenStack's upper-constraints.txt by adding Functest's requirements. This file is temporarily duplicated to allow building the containers. It will be removed via a next patch when this patch is merged. openbaton-cli could be updated (e.g. 3.2.8). Change-Id: I26de2d22f9e8973c5a58c3cc5129142fa628e57a Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 5 +++-- docker/smoke/thirdparty-requirements.txt | 12 ++++++------ docker/smoke/upper-constraints.txt | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 docker/smoke/upper-constraints.txt (limited to 'docker/smoke') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index ec050ea4e..5a3b59be6 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,14 +1,15 @@ FROM ollivier/functest-core COPY thirdparty-requirements.txt thirdparty-requirements.txt +COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ - pip install --src /src \ + pip install --src /src -cupper-constraints.txt \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \ -rthirdparty-requirements.txt && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm thirdparty-requirements.txt && \ + rm thirdparty-requirements.txt upper-constraints.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml diff --git a/docker/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt index 5e60fb74f..be1980f2c 100644 --- a/docker/smoke/thirdparty-requirements.txt +++ b/docker/smoke/thirdparty-requirements.txt @@ -1,8 +1,8 @@ -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn -git+https://gerrit.opnfv.org/gerrit/opera#egg=opera -git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning -git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc +baro_tests +sdnvpn +opera +securityscanning +sfc tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 --e git+https://github.com/openstack/refstack-client#egg=refstack-client +refstack-client diff --git a/docker/smoke/upper-constraints.txt b/docker/smoke/upper-constraints.txt new file mode 100644 index 000000000..73ec7f41b --- /dev/null +++ b/docker/smoke/upper-constraints.txt @@ -0,0 +1,17 @@ +git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules +git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps +git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests +git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn +git+https://gerrit.opnfv.org/gerrit/opera#egg=opera +git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning +git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc +-e git+https://github.com/openstack/refstack-client#egg=refstack-client +cloudify_rest_client===4.0 +iniparse===0.4 +openbaton-cli===2.2.1b7 +robotframework===3.0.2 +robotframework-httplibrary===0.4.2 +robotframework-requests===0.4.7 +robotframework-sshlibrary===2.1.3;python_version=='2.7' +kingbird===1.1.0 +rally===0.9.1 -- cgit 1.2.3-korg