From 6b84fbf8f2a92fc9c591e26eeec4b69cc1aa2ffe Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Wed, 28 Dec 2022 14:49:46 +0100
Subject: [PATCH] Fix CI

- Remove skipsdist that it was never supported and causes breakage
when used with usedevelop.
- add script to allowlist for pep8 test
- disable setuptools autodiscovery
- Increase base VM memory according to new requirements for CS9
based IPA

Change-Id: I0bfef09a5312a17be54ce5c09805f06b7c349026
---
 setup.py                | 1 +
 tox.ini                 | 3 ++-
 zuul.d/ironic-jobs.yaml | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index f63cc23c52..dd26ed49b7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,4 +18,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
+    py_modules=[],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index e55eb1038c..97ea9f7074 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 minversion = 3.18.0
-skipsdist = True
 envlist = py3,pep8
 ignore_basepython_conflict=true
 
@@ -45,6 +44,8 @@ deps=
     Pygments>=2.2.0 # BSD
     bashate>=0.5.1 # Apache-2.0
 allowlist_externals = bash
+                      {toxinidir}/tools/run_bashate.sh
+                      {toxinidir}/tools/check-releasenotes.py
 commands =
   bash tools/flake8wrap.sh {posargs}
   # Run bashate during pep8 runs to ensure violations are caught by
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 2387b4eb93..f311ef1ecb 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -47,7 +47,7 @@
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
         IRONIC_VM_COUNT: 2
         IRONIC_VM_EPHEMERAL_DISK: 1
-        IRONIC_VM_SPECS_RAM: 2600
+        IRONIC_VM_SPECS_RAM: 4096
         IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
         # NOTE(dtantsur): in some jobs we end up with 12 disks total, so reduce
         # each of them. For don't need all 10 GiB for CirrOS anyway.
@@ -701,7 +701,6 @@
         IRONIC_IPXE_ENABLED: False
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_AUTOMATED_CLEAN_ENABLED: False
-        IRONIC_VM_SPECS_RAM: 4096
 
 - job:
     # Security testing for known issues