Update requirements
Requires docker==4.4.1 since version 4.4.0 can't be installed Rerun tests on integration failures Remove redundant requirements Co-Author: pini <pkomarov@redhat.com> Change-Id: I0cd54b6a9361e8e3c3205da2ba939baba2c6b1ce
This commit is contained in:
parent
b0fdc49eab
commit
4d88f7d81a
|
@ -1,3 +1,2 @@
|
||||||
pandas # BSD
|
pandas # BSD
|
||||||
python-openstackclient # APACHE-2.0
|
|
||||||
validations-libs # APACHE-2.0
|
validations-libs # APACHE-2.0
|
||||||
|
|
|
@ -1,27 +1,22 @@
|
||||||
# Tobiko framework requirements
|
# Tobiko framework requirements
|
||||||
|
|
||||||
coverage==5.3.0
|
docker==4.4.1
|
||||||
docker==4.4.0
|
|
||||||
fixtures==3.0.0
|
fixtures==3.0.0
|
||||||
keystoneauth1==4.3.0
|
|
||||||
Jinja2==2.11.2
|
Jinja2==2.11.2
|
||||||
junitxml==0.7.0
|
keystoneauth1==4.3.0
|
||||||
mock==3.0.5
|
|
||||||
netaddr==0.8.0
|
netaddr==0.8.0
|
||||||
neutron-lib==2.7.0
|
neutron-lib==2.7.0
|
||||||
os-testr==2.0.0
|
|
||||||
oslo.config==8.4.0
|
oslo.config==8.4.0
|
||||||
oslo.log==4.4.0
|
oslo.log==4.4.0
|
||||||
paramiko==2.7.2
|
paramiko==2.7.2
|
||||||
pbr==5.5.1
|
pbr==5.5.1
|
||||||
podman==1.6.0
|
podman==1.6.0
|
||||||
python-heatclient==2.3.0
|
|
||||||
python-glanceclient==3.2.2
|
python-glanceclient==3.2.2
|
||||||
|
python-heatclient==2.3.0
|
||||||
python-neutronclient==7.2.1
|
python-neutronclient==7.2.1
|
||||||
python-novaclient==17.2.1
|
python-novaclient==17.2.1
|
||||||
python-octaviaclient==2.2.0
|
python-octaviaclient==2.2.0
|
||||||
python-openstackclient==5.4.0
|
python-openstackclient==5.4.0
|
||||||
python-subunit==1.4.0
|
|
||||||
six==1.15.0
|
six==1.15.0
|
||||||
sshtunnel==0.3.1
|
sshtunnel==0.3.1
|
||||||
stestr==3.1.0
|
stestr==3.1.0
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
# Tobiko framework requirements
|
# Tobiko framework requirements
|
||||||
|
|
||||||
docker>=4.4.0 # Apache-2.0
|
docker>=4.4.1 # Apache-2.0
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
Jinja2>=2.11.2 # BSD
|
Jinja2>=2.11.2 # BSD
|
||||||
junitxml>=0.7.0 # MIT
|
|
||||||
keystoneauth1>=4.3.0 # Apache-2.0
|
keystoneauth1>=4.3.0 # Apache-2.0
|
||||||
netaddr>=0.8.0 # BSD
|
netaddr>=0.8.0 # BSD
|
||||||
neutron-lib>=2.7.0 # Apache-2.0
|
neutron-lib>=2.7.0 # Apache-2.0
|
||||||
|
|
|
@ -4,21 +4,32 @@ test_workflow_steps:
|
||||||
- tox_description: 'run unit test cases'
|
- tox_description: 'run unit test cases'
|
||||||
tox_envlist: py3
|
tox_envlist: py3
|
||||||
tox_step_name: unit
|
tox_step_name: unit
|
||||||
|
tox_environment:
|
||||||
|
TOX_RERUNS: 0
|
||||||
|
|
||||||
- tox_description: 'run functional test cases'
|
- tox_description: 'run functional test cases'
|
||||||
tox_envlist: functional
|
tox_envlist: functional
|
||||||
tox_step_name: functional
|
tox_step_name: functional
|
||||||
|
tox_environment:
|
||||||
|
TOX_RERUNS: 2
|
||||||
|
TOX_RERUNS_DELAY: 60
|
||||||
|
|
||||||
- tox_description: 'create workload resources'
|
- tox_description: 'create workload resources'
|
||||||
tox_envlist: scenario
|
tox_envlist: scenario
|
||||||
tox_step_name: create_resources
|
tox_step_name: create_resources
|
||||||
|
tox_environment:
|
||||||
|
TOX_RERUNS: 2
|
||||||
|
TOX_RERUNS_DELAY: 60
|
||||||
|
|
||||||
# - tox_description: 'run disruptive test cases'
|
# - tox_description: 'run disruptive test cases'
|
||||||
# tox_envlist: faults
|
# tox_envlist: faults
|
||||||
# tox_step_name: faults
|
# tox_step_name: faults
|
||||||
|
# tox_environment:
|
||||||
|
# TOX_RERUNS: 0
|
||||||
|
|
||||||
- tox_description: 'verify workload resources'
|
- tox_description: 'verify workload resources'
|
||||||
tox_envlist: scenario
|
tox_envlist: scenario
|
||||||
tox_step_name: verify_resources
|
tox_step_name: verify_resources
|
||||||
tox_environment:
|
tox_environment:
|
||||||
TOBIKO_PREVENT_CREATE: yes
|
TOBIKO_PREVENT_CREATE: yes
|
||||||
|
TOX_RERUNS: 0
|
||||||
|
|
|
@ -6,4 +6,5 @@ mock>=2.0.0 # BSD
|
||||||
psutil>=5.7.2 # BSD
|
psutil>=5.7.2 # BSD
|
||||||
pytest>=6.0.0 # MIT
|
pytest>=6.0.0 # MIT
|
||||||
pytest-html>=3.0.0 # MPL-2.0
|
pytest-html>=3.0.0 # MPL-2.0
|
||||||
|
pytest-rerunfailures>=9.0.0 # MPL-2.0
|
||||||
pytest-xdist[psutil]>=2.0.0 # MIT
|
pytest-xdist[psutil]>=2.0.0 # MIT
|
||||||
|
|
|
@ -51,6 +51,10 @@ TOX_NUM_PROCESSES = os.environ.get('TOX_NUM_PROCESSES') or 'auto'
|
||||||
|
|
||||||
TOX_RUN_TESTS_TIMEOUT = float(os.environ.get('TOX_RUN_TESTS_TIMEOUT') or 0.)
|
TOX_RUN_TESTS_TIMEOUT = float(os.environ.get('TOX_RUN_TESTS_TIMEOUT') or 0.)
|
||||||
|
|
||||||
|
TOX_RERUNS = int(os.environ.get('TOX_RERUNS') or 0)
|
||||||
|
TOX_RERUNS_DELAY = int(os.environ.get('TOX_RERUNS_DELAY') or 5)
|
||||||
|
|
||||||
|
|
||||||
TOX_PYDEV_DEBUG = bool(
|
TOX_PYDEV_DEBUG = bool(
|
||||||
os.environ.get('TOX_PYDEV_DEBUG', 'false').lower() in
|
os.environ.get('TOX_PYDEV_DEBUG', 'false').lower() in
|
||||||
['true', 'yes', '1'])
|
['true', 'yes', '1'])
|
||||||
|
@ -142,9 +146,13 @@ def debug_test_cases():
|
||||||
def run_test_cases():
|
def run_test_cases():
|
||||||
xdist_options = ''
|
xdist_options = ''
|
||||||
if TOX_NUM_PROCESSES != '1':
|
if TOX_NUM_PROCESSES != '1':
|
||||||
xdist_options = f"--numprocesses {TOX_NUM_PROCESSES} --dist loadscope"
|
xdist_options = f"--numprocesses '{TOX_NUM_PROCESSES}' --dist loadscope"
|
||||||
|
rerun_options = ''
|
||||||
|
if TOX_RERUNS:
|
||||||
|
rerun_options = f"--reruns '{TOX_RERUNS}' --reruns-delay '{TOX_RERUNS_DELAY}'"
|
||||||
common.execute(f"pytest "
|
common.execute(f"pytest "
|
||||||
f"{xdist_options} "
|
f"{xdist_options} "
|
||||||
|
f"{rerun_options} "
|
||||||
f"--junitxml={TOX_REPORT_XML} "
|
f"--junitxml={TOX_REPORT_XML} "
|
||||||
f"--html={TOX_REPORT_HTML} --self-contained-html "
|
f"--html={TOX_REPORT_HTML} --self-contained-html "
|
||||||
f"{common.get_posargs()}",
|
f"{common.get_posargs()}",
|
||||||
|
|
Loading…
Reference in New Issue