diff options
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 6 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 8 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 6 | ||||
| -rw-r--r-- | requirements.txt | 16 | ||||
| -rw-r--r-- | test-requirements.txt | 8 | ||||
| -rw-r--r-- | tox.ini | 2 | ||||
| -rw-r--r-- | upper-constraints.txt | 4 |
13 files changed, 35 insertions, 27 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index a4561f6af..71a81541e 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index a66993e2a..cb44105af 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1a409b051..c53099cce 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG FDS_TAG=master ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index a0cf3f90b..fc9d81d0b 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -11,12 +11,13 @@ tiers: - case_name: doctor-notification project_name: doctor + enabled: false criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: 'apex' + installer: '(apex)|(fuel)|(daisy)' scenario: '^((?!fdio|nofeature).)*$' run: module: 'xtesting.core.feature' @@ -27,6 +28,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- @@ -41,6 +43,7 @@ tiers: - case_name: functest-odl-sfc project_name: sfc + enabled: false criteria: 100 blocking: false description: >- @@ -56,6 +59,7 @@ tiers: - case_name: barometercollectd project_name: barometer + enabled: false criteria: 100 blocking: false description: >- diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 73c11b447..914d4eefc 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,7 +1,7 @@ robotframework-httplibrary robotframework-requests robotframework-sshlibrary;python_version=='2.7' -baro_tests -sdnvpn -sfc -doctor-tests;python_version>='3.0' +# baro_tests +# sdnvpn +# sfc +# doctor-tests;python_version>='3.0' diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index bbc0a0760..a86716626 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e09ea1c2c..7eb9eb292 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index e65c0c484..afaec2320 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG VIMS_TAG=stable ARG JUJU_TAG=tags/juju-2.2.5 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index d3474c1a6..778025905 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -262,12 +262,13 @@ tiers: - case_name: doctor-notification project_name: doctor + enabled: false criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: 'apex' + installer: '(apex)|(fuel)|(daisy)' scenario: '^((?!fdio|nofeature).)*$' run: module: 'xtesting.core.feature' @@ -278,6 +279,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- @@ -292,6 +294,7 @@ tiers: - case_name: functest-odl-sfc project_name: sfc + enabled: false criteria: 100 blocking: false description: >- @@ -307,6 +310,7 @@ tiers: - case_name: barometercollectd project_name: barometer + enabled: false criteria: 100 blocking: false description: >- diff --git a/requirements.txt b/requirements.txt index 3196f52a8..fa0a17b90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -PyYAML>=3.10.0 # MIT +PyYAML>=3.12 # MIT GitPython>=1.0.1 # BSD License (3 clause) requests>=2.14.2 # Apache-2.0 robotframework>=3.0 @@ -16,15 +16,15 @@ Flask!=0.11,<1.0,>=0.10 # BSD Flask-RESTful>=0.3.5 # BSD IPy flasgger # MIT -mock>=2.0 # BSD +mock>=2.0.0 # BSD PrettyTable<0.8,>=0.7.1 # BSD -six>=1.9.0 # MIT +six>=1.10.0 # MIT snaps SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -paramiko>=2.0 # LGPLv2.1+ -Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) -httplib2>=0.7.5 # MIT -oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0 -oslo.utils>=3.20.0 # Apache-2.0 +paramiko>=2.0.0 # LGPLv2.1+ +Jinja2>=2.10 # BSD License (3 clause) +httplib2>=0.9.1 # MIT +oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 +oslo.utils>=3.33.0 # Apache-2.0 xtesting refstack-client diff --git a/test-requirements.txt b/test-requirements.txt index 82d1222c7..84c5a4435 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0 # BSD -nose # LGPL +mock>=2.0.0 # BSD +nose>=1.3.7 # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 -sphinx>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD sphinx-opnfv-theme sphinx-rtd-theme yamllint -doc8 # Apache-2.0 +doc8>=0.6.0 # Apache-2.0 @@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} diff --git a/upper-constraints.txt b/upper-constraints.txt index 7e02ba8c4..48a4e22f5 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -19,6 +19,6 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7' IPy===0.83 ansible===2.3.2.0 flasgger===0.6.6 -xtesting===0.31.0 -networking-bgpvpn===7.0.0 +xtesting===0.40.0 +networking-bgpvpn===8.0.0 sphinx-opnfv-theme===0.1.1 |