From 39b6553161d2fa222f8ebd6b13fdb746a7f05837 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Fri, 16 Dec 2022 11:00:48 +0100
Subject: [PATCH] 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
---
 setup.py                             | 1 +
 tox.ini                              | 1 +
 zuul.d/ironic-python-agent-jobs.yaml | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index cd35c3c35..31d6ada17 100644
--- a/setup.py
+++ b/setup.py
@@ -17,4 +17,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
+    py_modules=[],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index c3006ab1b..5863ec891 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 3e06c8c06..819e57d8a 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: