Merge "Fix and cleanup rally non-voting jobs"

This commit is contained in:
Jenkins 2016-12-12 09:38:32 +00:00 committed by Gerrit Code Review
commit 4df928ae61
3 changed files with 22 additions and 22 deletions

View File

@ -13896,34 +13896,38 @@
node:
- centos-7
- ubuntu-xenial
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}{suffix}:
job-mode: light
ctx-mode: discover-resources
compare: 1
ceilometer: 0
heat: 0
sahara: 0
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
suffix: ''
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}{suffix}:
job-mode: full
ctx-mode: discover-resources
compare: 0
ceilometer: 1
heat: 1
sahara: 1
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
suffix: ''
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}{suffix}:
job-mode: light
ctx-mode: create-resources
compare: 1
ceilometer: 1
heat: 1
sahara: 1
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
suffix: '-nv'
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}{suffix}:
job-mode: full
ctx-mode: create-resources
compare: 0
ceilometer: 1
heat: 1
sahara: 1
suffix: '-nv'
- gate-rally-dsvm-certification-with-keystone-{keystone-version}{suffix}:
keystone-version: v2
suffix: '-nv'
@ -13945,15 +13949,18 @@
suffix: '-nv'
name: 'unstable'
telemetry: '1'
- gate-rally-dsvm-rally-{service}:
- gate-rally-dsvm-rally-{service}{suffix}:
service: cinder
heat: 0
- gate-rally-dsvm-rally-{service}:
suffix: '-nv'
- gate-rally-dsvm-rally-{service}{suffix}:
service: heat
heat: 1
- gate-rally-dsvm-rally-{service}:
suffix: '-nv'
- gate-rally-dsvm-rally-{service}{suffix}:
heat: 0
service: nova
suffix: '-nv'
- gate-rally-dsvm-{name}-{node}{suffix}:
node: ubuntu-xenial
suffix: ''

View File

@ -739,7 +739,7 @@
- console-log
- job-template:
name: 'gate-rally-dsvm-rally-{service}'
name: 'gate-rally-dsvm-rally-{service}{suffix}'
node: ubuntu-xenial
wrappers:
@ -863,7 +863,7 @@
- job-template:
name: 'gate-rally-dsvm-verify-{job-mode}-{ctx-mode}'
name: 'gate-rally-dsvm-verify-{job-mode}-{ctx-mode}{suffix}'
node: ubuntu-xenial
wrappers:

View File

@ -1873,9 +1873,6 @@ jobs:
- name: gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-trusty
branch: ^stable/newton$
- name: ^gate-rally-dsvm-rally-.*$
voting: false
- name: ^gate-rally-tox-self-ubuntu-(trusty|xenial)$
voting: false
@ -1890,8 +1887,7 @@ jobs:
- ^rally/verification.*$
- ^tests/ci/.*verify.*$
- name: gate-rally-dsvm-verify-full-create-resources
voting: false
- name: ^gate-rally-dsvm-verify-full-create-resources.*$
files:
- ^rally/cli/commands/verify.py$
- ^rally/common/io/subunit_v2.py$
@ -1899,9 +1895,6 @@ jobs:
- ^rally/verification.*$
- ^tests/ci/.*verify.*$
- name: gate-rally-dsvm-verify-light-create-resources
voting: false
# NOTE(aweyl) tempest test for vitrage was introduced in the mitaka cycle,
# so testing the earlier branches doesn't make sense.
- name: ^gate-vitrage-dsvm-datasources-ubuntu-trusty$
@ -16215,9 +16208,9 @@ projects:
- gate-rally-install-ubuntu-xenial
- gate-rally-dsvm-rally-ubuntu-xenial
- gate-rally-dsvm-keystone-v2api-rally
- gate-rally-dsvm-rally-cinder
- gate-rally-dsvm-rally-heat
- gate-rally-dsvm-rally-nova
- gate-rally-dsvm-rally-cinder-nv
- gate-rally-dsvm-rally-heat-nv
- gate-rally-dsvm-rally-nova-nv
- gate-rally-dsvm-manila-multibackend
- gate-rally-dsvm-manila-multibackend-no-ss
- gate-rally-dsvm-neutron-rally-ubuntu-xenial
@ -16227,8 +16220,8 @@ projects:
- gate-rally-dsvm-cli
- gate-rally-dsvm-verify-light-discover-resources
- gate-rally-dsvm-verify-full-discover-resources
- gate-rally-dsvm-verify-light-create-resources
- gate-rally-dsvm-verify-full-create-resources
- gate-rally-dsvm-verify-light-create-resources-nv
- gate-rally-dsvm-verify-full-create-resources-nv
- gate-rally-tox-self-ubuntu-xenial
gate:
- gate-rally-install-centos-7