Run Grenade job under Python 2 for compatibility

1. Run Grenade job under Python 2 for compatibility
2. Temporary mark telemetry-dsvm-integration non-voting
3. Remove telemter py37 due to use fedora nodeset

Change-Id: I3289c3bf085fd5fd8f40074bd885f30375b2d50b
This commit is contained in:
Pierre Riteau 2020-02-20 12:27:03 +01:00 committed by zhurong
parent 9923f27d24
commit 010dae0094
2 changed files with 21 additions and 18 deletions

View File

@ -9,20 +9,6 @@
- openstack/devstack-gate
- openstack/ceilometer
- job:
name: telemetry-tox-py37
parent: openstack-tox
timeout: 2400
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^releasenotes/.*$
vars:
tox_envlist: py37
bindep_profile: test py37
nodeset: fedora-latest
- project:
templates:
- openstack-python-jobs
@ -32,22 +18,38 @@
- release-notes-jobs
check:
jobs:
- telemetry-tox-py37
- openstack-tox-cover
- grenade-dsvm-ceilometer:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
- telemetry-dsvm-integration
- ^reno.yaml$
- telemetry-dsvm-integration:
voting: false
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
- ^reno.yaml$
- ^doc/.*$
- ^.*\.rst$
- ^releasenotes/.*$
gate:
queue: telemetry
jobs:
- telemetry-tox-py37
- grenade-dsvm-ceilometer:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
- telemetry-dsvm-integration
- ^reno.yaml$
- telemetry-dsvm-integration:
voting: false
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
- ^reno.yaml$
- ^doc/.*$
- ^.*\.rst$
- ^releasenotes/.*$
experimental:
jobs:
# TripleO jobs that deploy Telemetry.

View File

@ -31,6 +31,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_USE_PYTHON3=False
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE