Merge "Update the oslo.messaging-dsvm-functional test"

This commit is contained in:
Jenkins 2016-09-05 08:36:21 +00:00 committed by Gerrit Code Review
commit a76935d29c
3 changed files with 29 additions and 25 deletions

View File

@ -46,7 +46,7 @@
- console-log
- job-template:
name: '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}'
name: '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}'
node: '{node}'
wrappers:

View File

@ -8359,31 +8359,31 @@
node: ubuntu-trusty-2-node
job-suffix: ''
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: rabbit
pipeline: gate
node: ubuntu-trusty
ostype: ''
job-suffix: ''
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py34'
driver: rabbit
pipeline: gate
node: ubuntu-trusty
ostype: ''
job-suffix: ''
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: qpid
pipeline: gate
node: ubuntu-trusty
ostype: ''
job-suffix: ''
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: zeromq
pipeline: gate
@ -8391,23 +8391,23 @@
ostype: ''
job-suffix: ''
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: zeromq
pipeline: gate
node: ubuntu-trusty
ostype: '-proxy'
job-suffix: ''
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: zeromq
pipeline: gate
node: ubuntu-trusty
ostype: '-pub-sub'
job-suffix: ''
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: pika
pipeline: gate
@ -8415,7 +8415,7 @@
ostype: ''
job-suffix: ''
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}':
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py27'
driver: amqp1
pipeline: gate
@ -8423,6 +8423,14 @@
ostype: '-centos7'
job-suffix: ''
branch-override: default
- '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}{ostype}{job-suffix}':
version: 'py34'
driver: amqp1
pipeline: gate
node: 'centos-7'
ostype: '-centos7'
job-suffix: '-nv'
branch-override: default
- '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}':
pipeline: gate
plugin: zmq

View File

@ -2106,12 +2106,8 @@ jobs:
branch: ^(?!stable/(liberty|mitaka)).*$
voting: false
- name: ^gate-oslo.messaging-dsvm-functional-.*-rabbit$
voting: false
- name: ^gate-oslo.messaging-dsvm-functional-.*-qpid$
- name: ^gate-oslo.messaging-dsvm-functional-.*-qpid-nv$
branch: ^stable/liberty$
voting: false
- name: ^gate-oslo.messaging-dsvm-functional-.*-amqp1.*$
branch: ^(?!stable/liberty).*$
@ -2124,7 +2120,6 @@ jobs:
- name: ^gate-oslo.messaging-dsvm-functional-.*-zeromq-.*$
branch: ^(?!stable/liberty).*$
voting: false
- name: gate-oslo.log-src-grenade-dsvm
branch: ^(?!stable/liberty).*$
@ -12492,14 +12487,15 @@ projects:
- name: stable-compat-jobs
- name: release-notes-jobs
check:
- gate-oslo.messaging-dsvm-functional-py27-rabbit
- gate-oslo.messaging-dsvm-functional-py34-rabbit
- gate-oslo.messaging-dsvm-functional-py27-qpid
- gate-oslo.messaging-dsvm-functional-py27-rabbit-nv
- gate-oslo.messaging-dsvm-functional-py34-rabbit-nv
- gate-oslo.messaging-dsvm-functional-py27-qpid-nv
- gate-oslo.messaging-dsvm-functional-py27-amqp1-centos7
- gate-oslo.messaging-dsvm-functional-py34-amqp1-centos7-nv
- gate-oslo.messaging-dsvm-functional-py27-pika
- gate-oslo.messaging-dsvm-functional-py27-zeromq
- gate-oslo.messaging-dsvm-functional-py27-zeromq-proxy
- gate-oslo.messaging-dsvm-functional-py27-zeromq-pub-sub
- gate-oslo.messaging-dsvm-functional-py27-zeromq-proxy-nv
- gate-oslo.messaging-dsvm-functional-py27-zeromq-pub-sub-nv
- gate-oslo.messaging-src-dsvm-full-amqp1-centos7
- gate-oslo.messaging-src-dsvm-full-pika
- gate-oslo.messaging-src-dsvm-full-zmq