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/Dockerfile | 11 +++++------ docker/Dockerfile.aarch64 | 11 +++++------ docker/core/Dockerfile | 9 ++++----- docker/core/upper-constraints.txt | 17 +++++++++++++++++ docker/smoke/Dockerfile | 5 +++-- docker/smoke/thirdparty-requirements.txt | 12 ++++++------ docker/smoke/upper-constraints.txt | 17 +++++++++++++++++ docker/thirdparty-requirements.txt | 12 ++++++------ docker/upper-constraints.txt | 17 +++++++++++++++++ requirements.txt | 16 ++++++++-------- tox.ini | 3 +-- upper-constraints.txt | 17 +++++++++++++++++ 12 files changed, 106 insertions(+), 41 deletions(-) create mode 100644 docker/core/upper-constraints.txt create mode 100644 docker/smoke/upper-constraints.txt create mode 100644 docker/upper-constraints.txt create mode 100644 upper-constraints.txt diff --git a/docker/Dockerfile b/docker/Dockerfile index 7db184f43..81d5167ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -70,18 +70,17 @@ RUN mkdir -p ${REPOS_VNFS_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt +COPY upper-constraints.txt upper-constraints.txt RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ + > o-upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ - git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ - -r thirdparty-requirements.txt && \ + -rthirdparty-requirements.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ - rm thirdparty-requirements.txt upper-constraints.txt + rm thirdparty-requirements.txt upper-constraints.txt o-upper-constraints.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 1339e5e96..1140eaddf 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -69,18 +69,17 @@ RUN mkdir -p ${REPOS_VNFS_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt +COPY upper-constraints.txt upper-constraints.txt RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ + > o-upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ - git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ - -r thirdparty-requirements.txt && \ + -rthirdparty-requirements.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ - rm thirdparty-requirements.txt upper-constraints.txt + rm thirdparty-requirements.txt upper-constraints.txt o-upper-constraints.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 4f3210d7c..4aa9e5c41 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:3.6 +COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git && \ @@ -8,12 +9,10 @@ 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=stable/ocata | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ - git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps \ + > o-upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ git+https://gerrit.opnfv.org/gerrit/functest#egg=functest && \ - rm upper-constraints.txt && \ + rm upper-constraints.txt o-upper-constraints.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ diff --git a/docker/core/upper-constraints.txt b/docker/core/upper-constraints.txt new file mode 100644 index 000000000..73ec7f41b --- /dev/null +++ b/docker/core/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 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 diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 5e60fb74f..be1980f2c 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/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/upper-constraints.txt b/docker/upper-constraints.txt new file mode 100644 index 000000000..73ec7f41b --- /dev/null +++ b/docker/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 diff --git a/requirements.txt b/requirements.txt index 66a738715..5344d0c30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,16 +11,16 @@ python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0 python-tackerclient>=0.8.0 # Apache-2.0 pexpect!=3.3,>=3.1 # ISC License requests!=2.12.2,>=2.10.0 # Apache-2.0 -robotframework==3.0.2 -robotframework-httplibrary==0.4.2 -robotframework-requests==0.4.7 -robotframework-sshlibrary==2.1.3;python_version=='2.7' -scp==0.10.2 +robotframework>=3.0 +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary;python_version=='2.7' +scp dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE dnspython3!=1.13.0,!=1.14.0,>=1.12.0;python_version>='3.0' # http://www.dnspython.org/LICENSE -click==6.6 -openbaton-cli==2.2.1-beta7 -cloudify_rest_client==4.0 +click +openbaton-cli +cloudify_rest_client mock>=2.0 # BSD iniparse==0.4 PrettyTable<0.8,>=0.7.1 # BSD diff --git a/tox.ini b/tox.ini index 69c2aa5c1..208091ac3 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,8 @@ usedevelop = True deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules - git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps install_command = pip install \ + -c{toxinidir}/upper-constraints.txt \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \ {opts} {packages} commands = nosetests --with-xunit \ diff --git a/upper-constraints.txt b/upper-constraints.txt new file mode 100644 index 000000000..73ec7f41b --- /dev/null +++ b/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