diff --git a/tox.ini b/tox.ini index b949da33a28..eb42568fed6 100644 --- a/tox.ini +++ b/tox.ini @@ -27,6 +27,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt hacking>=3.0.1,<3.1.0 # Apache-2.0 + setuptools<82.0.0 allowlist_externals = bash commands = bash {toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}" diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 19ccdc7fd64..c103a14426a 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -149,19 +149,6 @@ ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256 Q_BUILD_OVS_FROM_GIT: true -- job: - name: neutron-fullstack-with-uwsgi-fips - parent: neutron-fullstack-with-uwsgi - nodeset: devstack-single-node-centos-9-stream - description: | - Functional testing for a FIPS enabled Centos 9 system - vars: - nslookup_target: 'opendev.org' - enable_fips: True - devstack_localrc: - ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256 - Q_BUILD_OVS_FROM_GIT: true - - job: name: neutron-linuxbridge-tempest-plugin-nftables parent: neutron-tempest-plugin-linuxbridge-zed diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index e376df6bcac..ee9b38f81c3 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -51,7 +51,6 @@ - neutron-functional - neutron-functional-with-uwsgi-fips - neutron-fullstack - - neutron-fullstack-with-uwsgi-fips - neutron-ovn-grenade-multinode - neutron-ovn-grenade-multinode-tick-tick: voting: false @@ -117,7 +116,6 @@ - neutron-functional - neutron-functional-with-uwsgi-fips - neutron-fullstack - - neutron-fullstack-with-uwsgi-fips - neutron-ovs-tempest-slow - neutron-ovn-tempest-slow - neutron-ovn-tempest-postgres-full