Use tox constraints instead of upper constraints
Drop cap on tenacity, since it is already capped by upper constraints. Make grenade jobs non-voting, until they have been fixed. Depends-on: https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/787739 Change-Id: Ie21f8db89fc2045fd6cc6b1b7a5886b7e87e08e2
This commit is contained in:
parent
7ced36dc2d
commit
26f5ceca03
21
.zuul.yaml
21
.zuul.yaml
|
@ -1,13 +1,15 @@
|
||||||
- job:
|
- job:
|
||||||
name: grenade-ceilometer
|
name: grenade-ceilometer
|
||||||
parent: grenade
|
parent: grenade
|
||||||
|
voting: false
|
||||||
required-projects:
|
required-projects:
|
||||||
- opendev.org/openstack/grenade
|
- opendev.org/openstack/grenade
|
||||||
- opendev.org/openstack/ceilometer
|
- opendev.org/openstack/ceilometer
|
||||||
vars:
|
vars:
|
||||||
|
configure_swap_size: 8192
|
||||||
grenade_devstack_localrc:
|
grenade_devstack_localrc:
|
||||||
shared:
|
shared:
|
||||||
CEILOMETER_BACKEND: none
|
CEILOMETER_BACKEND: gnocchi
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ceilometer: https://opendev.org/openstack/ceilometer
|
ceilometer: https://opendev.org/openstack/ceilometer
|
||||||
devstack_services:
|
devstack_services:
|
||||||
|
@ -46,20 +48,3 @@
|
||||||
irrelevant-files: *ceilometer-irrelevant-files
|
irrelevant-files: *ceilometer-irrelevant-files
|
||||||
- telemetry-dsvm-integration-ipv6-only:
|
- telemetry-dsvm-integration-ipv6-only:
|
||||||
irrelevant-files: *ceilometer-irrelevant-files
|
irrelevant-files: *ceilometer-irrelevant-files
|
||||||
experimental:
|
|
||||||
jobs:
|
|
||||||
# TripleO jobs that deploy Telemetry.
|
|
||||||
# Note we don't use a project-template here, so it's easier
|
|
||||||
# to disable voting on one specific job if things go wrong.
|
|
||||||
# tripleo-ci-centos-7-scenario00(1|2)-multinode-oooq will only
|
|
||||||
# run on stable/pike while the -container will run in Queens
|
|
||||||
# and beyond.
|
|
||||||
# If you need any support to debug these jobs in case of
|
|
||||||
# failures, please reach us on #tripleo IRC channel.
|
|
||||||
# NOTE(sileht): These job takes 3 hours and fail most of the times.
|
|
||||||
# While other jobs take 20-30 minutes
|
|
||||||
# We can reenable it when they take less times.
|
|
||||||
- tripleo-ci-centos-7-scenario001-multinode-oooq
|
|
||||||
- tripleo-ci-centos-7-scenario001-standalone
|
|
||||||
- tripleo-ci-centos-7-scenario002-multinode-oooq
|
|
||||||
- tripleo-ci-centos-7-scenario002-standalone
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ python-cinderclient>=3.3.0 # Apache-2.0
|
||||||
PyYAML>=5.1 # MIT
|
PyYAML>=5.1 # MIT
|
||||||
requests!=2.9.0,>=2.8.1 # Apache-2.0
|
requests!=2.9.0,>=2.8.1 # Apache-2.0
|
||||||
stevedore>=1.20.0 # Apache-2.0
|
stevedore>=1.20.0 # Apache-2.0
|
||||||
tenacity>=4.12.0,<7.0.0 # Apache-2.0
|
tenacity>=4.12.0 # Apache-2.0
|
||||||
tooz[zake]>=1.47.0 # Apache-2.0
|
tooz[zake]>=1.47.0 # Apache-2.0
|
||||||
os-xenapi>=0.3.3 # Apache-2.0
|
os-xenapi>=0.3.3 # Apache-2.0
|
||||||
oslo.cache>=1.26.0 # Apache-2.0
|
oslo.cache>=1.26.0 # Apache-2.0
|
||||||
|
|
7
tox.ini
7
tox.ini
|
@ -6,8 +6,9 @@ ignore_basepython_conflict=true
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}
|
CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}
|
||||||
|
@ -46,7 +47,7 @@ commands = oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -b html doc/source doc/build/html
|
commands = sphinx-build -b html doc/source doc/build/html
|
||||||
setenv = PYTHONHASHSEED=0
|
setenv = PYTHONHASHSEED=0
|
||||||
|
|
Loading…
Reference in New Issue