Remove CI image build hacks #1429
Merged
+18
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Our internal CI testing pipeline using a similar build image to what the public Gnocchi pipeline uses revealed the root cause of some of the problems that required hacks to be applied to work around. I've now made a draft PR to address them upstream. |
Callum027
force-pushed
the
remove-ci-hacks
branch
4 times, most recently
from
7099350
to
10674e3
Compare
Fix CI image build issues that made certain hacks necessary for things to work, and remove hacks that are no longer required with the new Ubuntu 24.04-based CI image. * Use the Ubuntu-packaged version of Tox, Setuptools and and all other packages installed outside of the test environment. This is necessary to make dependency conflicts less likely due to setting `sitepackages` to `True` in Tox to pass through `python3-rados` to the test environment. * Remove the hack for deleting the distro-managed version of `pyparsing`, as the new version available in Ubuntu 24.04 is compatible. * Remove the hack for deleting the distro-packaged versions of the `jaraco.*` series of packages. The reason why this started causing problems is [Setuptools v71.0](https://setuptools.pypa.io/en/latest/history.html#v71-0-0) onwards changed behaviour to preferring external dependencies instead of the bundled versions if they are installed, even if they are not compatible. The `ceph-mgr` package installs the distro-managed version of `jaraco.text` (among others), causing the conflict. * Remove the patch for the distro-managed version of `werkzeug`, as the new version now adds the line for deferred annotation validation. * Don't set `VIRTUALENV_SETUPTOOLS=bundle` explicitly, as this is the default behaviour in virtualenvs created by Tox. `setuptools` was (and is) actually being installed, it was just erroring out on import due to the incompatible version of `jaraco.text` being found. `pip`'s error handling was hiding the real cause of the failure.
Callum027
force-pushed
the
remove-ci-hacks
branch
from
10674e3
to
9875bfc
Compare
chungg
approved these changes
Nov 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix CI image build issues that made certain hacks necessary for things to work, and remove hacks that are no longer required with the new Ubuntu 24.04-based CI image.
sitepackagestoTruein Tox to pass throughpython3-radosto the test environment.pyparsing, as the new version available in Ubuntu 24.04 is compatible.jaraco.*series of packages. The reason why this started causing problems is Setuptools v71.0 onwards changed behaviour to preferring external dependencies instead of the bundled versions if they are installed, even if they are not compatible. Theceph-mgrpackage installs the distro-managed version ofjaraco.text(among others), causing the conflict.werkzeug, as the new version now adds the line for deferred annotation validation.VIRTUALENV_SETUPTOOLS=bundleexplicitly, as this is the default behaviour in virtualenvs created by Tox.setuptoolswas (and is) actually being installed, it was just erroring out on import due to the incompatible version ofjaraco.textbeing found.pip's error handling was hiding the real cause of the failure.