diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml index 05c7f1d8..7b998103 100644 --- a/.zuul.d/zuul.yaml +++ b/.zuul.d/zuul.yaml @@ -72,7 +72,8 @@ #- rally-task-senlin #- rally-task-octavia: # voting: false - - rally-task-telemetry + - rally-task-telemetry: + voting: false - rally-task-watcher: # watcher-api did not start last time voting: false @@ -114,7 +115,6 @@ - rally_openstack/task/scenarios/neutron/trunk.py - rally_openstack/task/scenarios/neutron/network.py - tests/ci/playbooks - - rally-task-telemetry - rally-task-zaqar - rally-verify-tempest post: diff --git a/requirements.txt b/requirements.txt index 14467754..e74d89e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -requests!=2.20.0 # Apache License, Version 2.0 +requests!=2.20.0,!=2.24.0 # Apache License, Version 2.0 rally>=3.1.0 # Apache License, Version 2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 2d5c2f14..4d3e55c0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ pytest-html # Mozilla Public License pytest-xdist # MIT coverage!=4.4 # Apache License, Version 2.0 -ddt!=1.4.0 # MIT +ddt # MIT testtools # MIT # docs diff --git a/tests/ci/sync_requirements.py b/tests/ci/sync_requirements.py index 82858753..19bb7858 100644 --- a/tests/ci/sync_requirements.py +++ b/tests/ci/sync_requirements.py @@ -361,7 +361,7 @@ def update_upper_constraints(): include_comments=False, dependency_cls=UpperConstraint) - our_uc = [UpperConstraint(package_name=p.project_name, version=p.version) + our_uc = [UpperConstraint(package_name=p.project_name) for p in pkg_resources.working_set # do not include the current package at u-c if p.project_name != "rally-openstack"] diff --git a/tests/unit/test_plugins.py b/tests/unit/test_plugins.py new file mode 100644 index 00000000..c86f213b --- /dev/null +++ b/tests/unit/test_plugins.py @@ -0,0 +1,25 @@ +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import subprocess + +from tests.unit import test + + +class PluginsLoadingTestCase(test.TestCase): + + def test_plugins_loaded(self): + subprocess.check_output( + ["rally", "--debug", "plugin", "show", "Dummy.openstack"] + ) diff --git a/tox.ini b/tox.ini index b50f4be1..804eab21 100644 --- a/tox.ini +++ b/tox.ini @@ -65,7 +65,12 @@ commands = oslo-config-generator --config-file etc/rally/rally-config-generator.conf [testenv:requirements] -deps = requests[security] +deps = + # do not use upper-constraints file + --no-cache-dir + requests[security] + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python {toxinidir}/tests/ci/sync_requirements.py {posargs} [flake8] diff --git a/upper-constraints.txt b/upper-constraints.txt index 57b5097b..552c34ec 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -1,105 +1,128 @@ alembic===1.4.2 -appdirs===1.4.3 +apipkg===1.5 +appdirs===1.4.4 argparse===1.4.0 attrs===19.3.0 Babel===2.8.0 bcrypt===3.1.7 -cachetools===4.1.0 -certifi===2020.4.5.1 -cffi===1.14.0 +cachetools===4.1.1 +certifi===2020.6.20 +cffi===1.14.1 chardet===3.0.4 click===7.1.2 -cliff===3.1.0 -cmd2===0.8.9 -cryptography===2.9.2 -debtcollector===2.0.1 +cliff===3.4.0 +cmd2===1.2.1 +colorama===0.4.3 +coverage===5.2.1 +cryptography===3.0 +ddt===1.4.1 +debtcollector===2.2.0 decorator===4.4.2 -distlib===0.3.0 -dogpile.cache===0.9.2 +distlib===0.3.1 +docutils===0.15.2 +dogpile.cache===1.0.1 +execnet===1.7.1 extras===1.0.0 fasteners===0.14.1 filelock===3.0.12 fixtures===3.0.0 -futurist===2.1.1 +flake8===3.8.3 +futurist===2.2.0 gnocchiclient===7.0.6 -google-auth===1.14.1 -idna===2.9 -importlib-metadata===1.6.0 -importlib-resources===1.5.0 +google-auth===1.20.0 +hacking===3.2.0 +idna===2.10 +importlib-metadata===1.7.0 +importlib-resources===3.0.0 +iniconfig===1.0.1 iso8601===0.1.12 Jinja2===2.11.2 -jmespath===0.9.5 -jsonpatch===1.25 +jmespath===0.10.0 +jsonpatch===1.26 jsonpointer===2.0 jsonschema===3.2.0 -keystoneauth1===4.0.0 +keystoneauth1===4.2.0 kubernetes===11.0.0 linecache2===1.0.0 -Mako===1.1.2 +Mako===1.1.3 MarkupSafe===1.1.1 +mccabe===0.6.1 monotonic===1.5 +more-itertools===8.4.0 msgpack===0.6.1 munch===2.5.0 murano-pkg-check===0.3.0 -netaddr===0.7.19 +netaddr===0.8.0 netifaces===0.10.9 oauthlib===3.1.0 -openstacksdk===0.46.0 +openstacksdk===0.48.0 os-client-config===2.1.0 os-faults===0.2.7 os-service-types===1.7.0 -osc-lib===2.1.0 -oslo.concurrency===4.0.2 -oslo.config===8.0.2 -oslo.context===3.0.2 -oslo.db===8.1.0 -oslo.i18n===4.0.1 -oslo.log===4.1.1 -oslo.serialization===3.1.1 -oslo.utils===4.1.1 -osprofiler===3.1.0 +osc-lib===2.2.0 +oslo.concurrency===4.2.0 +oslo.config===8.3.1 +oslo.context===3.1.0 +oslo.db===8.3.0 +oslo.i18n===5.0.0 +oslo.log===4.3.0 +oslo.serialization===4.0.0 +oslo.utils===4.4.0 +osprofiler===3.3.0 +packaging===20.4 paramiko===2.7.1 pbr===5.4.5 -pip===19.1.1 +pip===20.2.1 +pluggy===0.13.1 ply===3.11 prettytable===0.7.2 +py===1.9.0 pyasn1===0.4.8 pyasn1-modules===0.2.8 +pycodestyle===2.6.0 pycparser===2.20 -pyghmi===1.5.14 +pyflakes===2.2.0 +pyghmi===1.5.16 +Pygments===2.6.1 pyinotify===0.9.6 -PyNaCl===1.3.0 +PyNaCl===1.4.0 pyOpenSSL===19.1.0 pyparsing===2.4.7 pyperclip===1.8.0 pyrsistent===0.16.0 -python-barbicanclient===4.10.0 +pytest===6.0.1 +pytest-cov===2.10.0 +pytest-forked===1.3.0 +pytest-html===2.1.1 +pytest-metadata===1.10.0 +pytest-xdist===1.34.0 +python-barbicanclient===5.0.0 python-ceilometerclient===2.9.0 -python-cinderclient===7.0.0 +python-cinderclient===7.1.0 python-dateutil===2.8.1 -python-designateclient===4.0.0 +python-designateclient===4.1.0 python-editor===1.0.4 -python-glanceclient===3.1.1 -python-heatclient===2.1.0 -python-ironicclient===4.1.0 -python-keystoneclient===4.0.0 -python-magnumclient===3.0.0 -python-manilaclient===2.1.0 +python-glanceclient===3.2.0 +python-heatclient===2.2.0 +python-ironicclient===4.2.0 +python-keystoneclient===4.1.0 +python-magnumclient===3.2.0 +python-manilaclient===2.2.0 python-mimeparse===1.6.0 -python-mistralclient===4.0.1 -python-monascaclient===2.1.0 -python-muranoclient===2.0.1 -python-neutronclient===7.1.1 -python-novaclient===17.0.0 -python-octaviaclient===2.0.1 -python-openstackclient===5.2.0 -python-saharaclient===3.1.0 -python-senlinclient===2.0.1 +python-mistralclient===4.1.0 +python-monascaclient===2.2.0 +python-muranoclient===2.1.0 +python-neutronclient===7.2.0 +python-novaclient===17.2.0 +python-octaviaclient===2.1.0 +python-openstackclient===5.3.1 +python-saharaclient===3.2.0 +python-senlinclient===2.1.0 python-subunit===1.4.0 -python-swiftclient===3.9.0 -python-troveclient===3.3.1 -python-watcherclient===3.0.0 -python-zaqarclient===1.13.1 +python-swiftclient===3.10.0 +python-troveclient===5.0.0 +python-watcherclient===3.1.0 +python-zaqarclient===2.0.0 pytz===2020.1 PyYAML===5.3.1 rally===3.1.0 @@ -107,28 +130,30 @@ requests===2.23.0 requests-oauthlib===1.3.0 requestsexceptions===1.4.0 rfc3986===1.4.0 -rsa===4.0 +rsa===4.6 semantic-version===2.8.5 -setuptools===41.0.1 -simplejson===3.17.0 -six===1.14.0 -SQLAlchemy===1.3.16 +setuptools===49.2.1 +simplejson===3.17.2 +six===1.15.0 +SQLAlchemy===1.3.18 sqlalchemy-migrate===0.13.0 sqlparse===0.3.1 -stevedore===1.32.0 +stevedore===3.2.0 Tempita===0.5.2 testresources===2.0.1 testscenarios===0.5.0 testtools===2.4.0 +toml===0.10.1 traceback2===1.4.0 +ujson===3.1.0 unittest2===1.1.0 -urllib3===1.25.9 -virtualenv===20.0.20 +urllib3===1.25.10 +virtualenv===20.0.29 warlock===1.3.3 -wcwidth===0.1.9 +wcwidth===0.2.5 WebOb===1.8.6 websocket-client===0.57.0 -wheel===0.33.4 +wheel===0.34.2 wrapt===1.12.1 yaql===1.1.3 zipp===3.1.0