From 36f3e7092026188452cc217ed096ec728d8b736f Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 12 Jan 2021 16:38:43 +0100 Subject: [PATCH] [stable] Drop lower-constraints job As discussed in neutron team meeting [1], it is not worth fixing issues identified by new pip resolver in stable branches. So let's drop the job For rocky, update psutil functional test requirement (syncing with neutron rocky version), as detected by new pip resolver. Also drop rally job for rocky, as was done for neutron in 8fefd6e15ba84c6f52bc896e1b4f82f9752a25f8 [1] http://eavesdrop.openstack.org/meetings/networking/2021/networking.2021-01-12-14.00.log.html#l-164 Conflicts: lower-constraints.txt tox.ini zuul.d/project.yaml Change-Id: I96c59b2e6697d65184e87b731682fd7441519c89 (cherry picked from commit d07317b60e6d46aabc3a6e878924923a07661e75) --- lower-constraints.txt | 151 ------------------ .../tests/functional/requirements.txt | 2 +- tox.ini | 7 - zuul.d/networkin-ovn-rally-task.yaml | 41 ----- zuul.d/project.yaml | 4 - 5 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 lower-constraints.txt delete mode 100644 zuul.d/networkin-ovn-rally-task.yaml diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 97040c18f..000000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,151 +0,0 @@ -alabaster==0.7.10 -alembic==0.8.10 -amqp==2.1.1 -appdirs==1.3.0 -asn1crypto==0.23.0 -astroid==1.3.8 -Babel==2.3.4 -beautifulsoup4==4.6.0 -cachetools==2.0.0 -cffi==1.7.0 -chardet==3.0.4 -cliff==2.8.0 -cmd2==0.8.0 -contextlib2==0.4.0 -coverage==4.0 -cryptography==2.1 -debtcollector==1.2.0 -decorator==3.4.0 -deprecation==1.0 -doc8==0.6.0 -docutils==0.11 -dogpile.cache==0.6.2 -dulwich==0.15.0 -eventlet==0.18.2 -extras==1.0.0 -fasteners==0.7.0 -fixtures==3.0.0 -flake8==2.5.5 -flake8-import-order==0.12 -future==0.16.0 -futurist==1.2.0 -greenlet==0.4.10 -hacking==0.12.0 -idna==2.6 -imagesize==0.7.1 -iso8601==0.1.11 -Jinja2==2.10 -jmespath==0.9.0 -jsonpatch==1.16 -jsonpointer==1.13 -jsonschema==2.6.0 -keystoneauth1==3.4.0 -keystonemiddleware==4.17.0 -kombu==4.0.0 -linecache2==1.0.0 -logilab-common==1.4.1 -logutils==0.3.5 -Mako==0.4.0 -MarkupSafe==1.0 -mccabe==0.2.1 -mock==2.0.0 -monotonic==0.6 -mox3==0.20.0 -msgpack-python==0.4.0 -munch==2.1.0 -netaddr==0.7.18 -netifaces==0.10.4 -neutron==13.0.0.0b2 -neutron-lib==1.18.0 -openstackdocstheme==1.18.1 -openstacksdk==0.11.2 -os-client-config==1.28.0 -os-service-types==1.2.0 -os-testr==1.0.0 -os-xenapi==0.3.1 -osc-lib==1.8.0 -oslo.cache==1.26.0 -oslo.concurrency==3.25.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.db==4.27.0 -oslo.i18n==3.15.3 -oslo.log==3.36.0 -oslo.messaging==5.29.0 -oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.privsep==1.23.0 -oslo.reports==1.18.0 -oslo.rootwrap==5.8.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.utils==3.33.0 -oslo.versionedobjects==1.31.2 -oslotest==3.2.0 -osprofiler==1.4.0 -ovs==2.8.0 -ovsdbapp==0.12.4 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 -pecan==1.0.0 -pep8==1.5.7 -pika==0.10.0 -pika-pool==0.1.3 -positional==1.2.1 -prettytable==0.7.2 -psutil==3.2.2 -pycadf==1.1.0 -pycodestyle==2.3.1 -pycparser==2.18 -pyflakes==0.8.1 -Pygments==2.2.0 -pyinotify==0.9.6 -pylint==1.4.5 -pyOpenSSL==17.1.0 -pyparsing==2.1.0 -pyperclip==1.5.27 -pyroute2==0.4.21 -python-dateutil==2.5.3 -python-designateclient==2.7.0 -python-editor==1.0.3 -python-keystoneclient==3.8.0 -python-mimeparse==1.6.0 -python-neutronclient==6.7.0 -python-novaclient==9.1.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.12 -reno==2.5.0 -repoze.lru==0.7 -requests==2.14.2 -requestsexceptions==1.2.0 -restructuredtext-lint==1.1.1 -rfc3986==0.3.1 -Routes==2.3.1 -ryu==4.14 -simplejson==3.5.1 -six==1.10.0 -snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-websupport==1.0.1 -SQLAlchemy==1.2.0 -sqlalchemy-migrate==0.11.0 -sqlparse==0.2.2 -statsd==3.2.1 -stestr==1.0.0 -stevedore==1.20.0 -Tempita==0.5.2 -tenacity==4.4.0 -testrepository==0.0.18 -testresources==2.0.0 -testscenarios==0.4 -testtools==2.2.0 -tinyrpc==0.6 -traceback2==1.4.0 -unittest2==1.1.0 -vine==1.1.4 -waitress==1.1.0 -WebOb==1.7.1 -WebTest==2.0.27 -wrapt==1.7.0 diff --git a/networking_ovn/tests/functional/requirements.txt b/networking_ovn/tests/functional/requirements.txt index 2f9131d0b..f0ee211b9 100644 --- a/networking_ovn/tests/functional/requirements.txt +++ b/networking_ovn/tests/functional/requirements.txt @@ -4,6 +4,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -psutil>=1.1.1,<2.0.0 +psutil>=3.2.2 # BSD psycopg2 PyMySQL>=0.6.2 # MIT License diff --git a/tox.ini b/tox.ini index 04d605d16..0777cdcca 100644 --- a/tox.ini +++ b/tox.ini @@ -116,10 +116,3 @@ import-order-style = pep8 [hacking] import_exceptions = networking_ovn local-check-factory = neutron_lib.hacking.checks.factory - -[testenv:lower-constraints] -basepython = python3 -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt diff --git a/zuul.d/networkin-ovn-rally-task.yaml b/zuul.d/networkin-ovn-rally-task.yaml deleted file mode 100644 index 119d615da..000000000 --- a/zuul.d/networkin-ovn-rally-task.yaml +++ /dev/null @@ -1,41 +0,0 @@ -- job: - name: networking-ovn-rally-task - parent: rally-task-at-devstack - required-projects: - - name: openstack/devstack - - name: openstack/devstack-gate - - name: openstack/rally - - name: openstack/rally-openstack - override-checkout: 1.7.0 - - name: openstack/networking-ovn - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tools/.*$ - - ^tox.ini$ - - ^vagrant/.*$ - - ^migration/.*$ - vars: - devstack_plugins: - rally-openstack: https://opendev.org/openstack/rally-openstack - networking-ovn: https://opendev.org/openstack/networking-ovn - devstack_services: - ovn-northd: true - ovn-controller: true - networking-ovn-metadata-agent: true - br-ex-tcpdump: true - br-int-flows: true - q-dhcp: false - q-l3: false - q-agt: false - devstack_localrc: - PHYSICAL_NETWORK: public - Q_USE_PROVIDERNET_FOR_PUBLIC: true - ENABLE_CHASSIS_AS_GW: true - OVN_L3_CREATE_PUBLIC_NETWORK: true - OVN_BRANCH: branch-2.12 - rally_task: rally-jobs/ovn.yaml - timeout: 7800 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a93fe9b75..e255bf189 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -8,7 +8,6 @@ jobs: - networking-ovn-tempest-dsvm-ovs-release - networking-ovn-tempest-dsvm-ovs-release-python3 - - networking-ovn-rally-task - networking-ovn-dsvm-functional-py27 - networking-ovn-dsvm-functional: branches: ^(?!stable/newton).*$ @@ -21,7 +20,6 @@ # failures, please reach us on #tripleo IRC channel. - tripleo-ci-centos-7-scenario007-multinode-oooq-container: voting: false - - openstack-tox-lower-constraints - networking-ovn-dsvm-grenade: branches: ^(?!stable/(ocata|pike|queens)).*$ voting: false @@ -33,12 +31,10 @@ jobs: - networking-ovn-tempest-dsvm-ovs-release - networking-ovn-tempest-dsvm-ovs-release-python3 - - networking-ovn-rally-task - networking-ovn-dsvm-functional-py27 - networking-ovn-dsvm-functional: branches: ^(?!stable/newton).*$ - tripleo-ci-centos-7-scenario007-multinode-oooq - - openstack-tox-lower-constraints experimental: jobs: - networking-ovn-tempest-dsvm-multinode: