From 46dfe854890eb49e168434cd4de9ce213c2fdca4 Mon Sep 17 00:00:00 2001 From: Yatin Karel Date: Thu, 4 Jun 2026 12:17:20 +0530 Subject: [PATCH] [unmaintained only] Drop fullstack fips job These jobs are broken from quite some time, as discussed in last CI meeting drop these jobs from unmaintained branches. Additionally to fix tox jobs pin setuptools<82 to ensure pkg_resources is available. Signed-off-by: Yatin Karel Change-Id: I9d88f4e6d780c320bacd476bffb9a0ed6f13454b (cherry picked from commit a446e2cd88c563edb0bd83814221cf8c5741df66) Conflicts: zuul.d/job-templates.yaml --- tox.ini | 1 + zuul.d/base.yaml | 13 ------------- zuul.d/job-templates.yaml | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) 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