diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2020-02-20 12:27:03 +0100 |
|---|---|---|
| committer | zhurong <aaronzhu1121@gmail.com> | 2020-02-25 08:17:14 +0000 |
| commit | 010dae0094c16a704dedb72b17956a4d9c2050ca (patch) | |
| tree | ed0c34c6548349ad4701b86be97ae2656dec47da | |
| parent | 9923f27d24ef91f8600f428546df035214f6ec15 (diff) | |
| download | ceilometer-010dae0094c16a704dedb72b17956a4d9c2050ca.tar.gz | |
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
| -rw-r--r-- | .zuul.yaml | 38 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ceilometer/run.yaml | 1 |
2 files changed, 21 insertions, 18 deletions
@@ -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. diff --git a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml index a9431973..b11a9bac 100644 --- a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml @@ -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 |