diff options
| author | Riccardo Pittau <elfosardo@gmail.com> | 2022-12-16 11:00:48 +0100 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2023-01-02 14:40:35 +0100 |
| commit | 39b6553161d2fa222f8ebd6b13fdb746a7f05837 (patch) | |
| tree | 17618f31f024ec67d0354d1ecb91db03ddf4e1b8 | |
| parent | 5c0eab351c08492ca8c608fa157a5ef896b13e1a (diff) | |
| download | ironic-python-agent-39b6553161d2fa222f8ebd6b13fdb746a7f05837.tar.gz | |
Fix for tox4 and setuptools
- Disable auto discovery in setuptools
This is to avoid issues with latest setuptools after version 61.0
For more info see [1]
- add bash script to allowlist in tox.ini
- use default size for vm memory
[1] https://github.com/pypa/setuptools/issues/3197
Change-Id: Iae24917add1aae6b1ed46dba0d2c270b39c5698c
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 1 | ||||
| -rw-r--r-- | zuul.d/ironic-python-agent-jobs.yaml | 1 |
3 files changed, 2 insertions, 1 deletions
@@ -17,4 +17,5 @@ import setuptools setuptools.setup( setup_requires=['pbr>=2.0.0'], + py_modules=[], pbr=True) @@ -44,6 +44,7 @@ deps = pycodestyle>=2.0.0,<3.0.0 # MIT doc8>=0.8.1 # Apache-2.0 allowlist_externals = bash + {toxinidir}/tools/run_bashate.sh commands = flake8 {posargs:ironic_python_agent examples} # Run bashate during pep8 runs to ensure violations are caught by diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml index 3e06c8c0..819e57d8 100644 --- a/zuul.d/ironic-python-agent-jobs.yaml +++ b/zuul.d/ironic-python-agent-jobs.yaml @@ -21,7 +21,6 @@ devstack_localrc: IRONIC_BUILD_DEPLOY_RAMDISK: True IRONIC_VM_COUNT: 2 - IRONIC_VM_SPECS_RAM: 2750 # This matches the default in ironic-base, specifying for clarity IRONIC_RAMDISK_TYPE: dib devstack_services: |