From 521fd56de758a5da78c09a01b89e2925607b0ad9 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Sun, 12 Apr 2026 12:36:00 +0200 Subject: [PATCH 1/2] stable-only: drop bionic wheel cache job The ubuntu-bionic nodes are no longer available in the CI, so this job has been deleted. Clean up the dangling references to avoid zuul config errors. Signed-off-by: Dr. Jens Harbott Change-Id: I2e49dfff6bbc3d7de0681563cd7d93edbc48b167 (cherry picked from commit e7690d7e7bb3671a425b2332d92977deebf3eb00) (cherry picked from commit e7b93e87ba1ca4a152e36e9c8c93ac256a7aa4bc) --- .zuul.d/project.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 4f0c19d28..165b4427a 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -3,9 +3,6 @@ - openstack-python3-jobs check: jobs: - - build-wheel-cache-ubuntu-bionic: - files: - - bindep.txt - build-wheel-cache-ubuntu-focal: files: - bindep.txt @@ -65,9 +62,6 @@ - bindep.txt gate: jobs: - - build-wheel-cache-ubuntu-bionic: - files: - - bindep.txt - build-wheel-cache-ubuntu-focal: files: - bindep.txt From 139f2fe860a77dcc22163493a4a5c05059ba65dd Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Mon, 27 Apr 2026 17:34:53 +0200 Subject: [PATCH 2/2] [CI][stable-only] Fix py311 and validate jobs The two jobs are failing with error: ModuleNotFoundError: No module named 'pkg_resources' This is because recent setuptools (>=82.0.0) dropped pkg_resource module from its source. Hence the workaround is to cap it for py311 and validate jobs. Change-Id: I80b7aa537610ac5d35fa1b4c04f5246ec85a170e Signed-off-by: Elod Illes --- tox.ini | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tox.ini b/tox.ini index c75268cda..3d97a0da9 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,12 @@ deps = -c{toxinidir}/upper-constraints.txt commands = stestr run {posargs} +[testenv:py311] +deps = -c{toxinidir}/upper-constraints.txt + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + setuptools<82.0.0 + [testenv:py38-check-uc] allowlist_externals = check-conflicts @@ -56,6 +62,10 @@ commands = generate-constraints {posargs: -b blacklist.txt -r global-requirement [testenv:validate] allowlist_externals = validate-constraints +deps = -c{toxinidir}/upper-constraints.txt + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + setuptools<82.0.0 commands = validate-constraints {toxinidir}/global-requirements.txt {toxinidir}/upper-constraints.txt {toxinidir}/blacklist.txt