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
This commit is contained in:
parent
ef772c2c1e
commit
6b84fbf8f2
1
setup.py
1
setup.py
@ -18,4 +18,5 @@ import setuptools
|
|||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr>=2.0.0'],
|
setup_requires=['pbr>=2.0.0'],
|
||||||
|
py_modules=[],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
3
tox.ini
3
tox.ini
@ -1,6 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 3.18.0
|
minversion = 3.18.0
|
||||||
skipsdist = True
|
|
||||||
envlist = py3,pep8
|
envlist = py3,pep8
|
||||||
ignore_basepython_conflict=true
|
ignore_basepython_conflict=true
|
||||||
|
|
||||||
@ -45,6 +44,8 @@ deps=
|
|||||||
Pygments>=2.2.0 # BSD
|
Pygments>=2.2.0 # BSD
|
||||||
bashate>=0.5.1 # Apache-2.0
|
bashate>=0.5.1 # Apache-2.0
|
||||||
allowlist_externals = bash
|
allowlist_externals = bash
|
||||||
|
{toxinidir}/tools/run_bashate.sh
|
||||||
|
{toxinidir}/tools/check-releasenotes.py
|
||||||
commands =
|
commands =
|
||||||
bash tools/flake8wrap.sh {posargs}
|
bash tools/flake8wrap.sh {posargs}
|
||||||
# Run bashate during pep8 runs to ensure violations are caught by
|
# Run bashate during pep8 runs to ensure violations are caught by
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
|
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
|
||||||
IRONIC_VM_COUNT: 2
|
IRONIC_VM_COUNT: 2
|
||||||
IRONIC_VM_EPHEMERAL_DISK: 1
|
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'
|
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
|
||||||
# NOTE(dtantsur): in some jobs we end up with 12 disks total, so reduce
|
# 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.
|
# each of them. For don't need all 10 GiB for CirrOS anyway.
|
||||||
@ -701,7 +701,6 @@
|
|||||||
IRONIC_IPXE_ENABLED: False
|
IRONIC_IPXE_ENABLED: False
|
||||||
IRONIC_RAMDISK_TYPE: tinyipa
|
IRONIC_RAMDISK_TYPE: tinyipa
|
||||||
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
||||||
IRONIC_VM_SPECS_RAM: 4096
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
# Security testing for known issues
|
# Security testing for known issues
|
||||||
|
Loading…
Reference in New Issue
Block a user