From e37e0dc923bb081c777bdf1b296d5aaa4673f0a8 Mon Sep 17 00:00:00 2001 From: Ken Giusti Date: Mon, 22 Aug 2016 11:46:31 -0400 Subject: [PATCH] Update the oslo.messaging-dsvm-functional test * Use the '-nv' job suffix for non-voting jobs. * Enable Python 3.4 test of AMQP 1.0 driver Change-Id: I93208fea2ff298fff192b9a929f558ad7005949e --- jenkins/jobs/oslo.yaml | 2 +- jenkins/jobs/projects.yaml | 34 +++++++++++++++++++++------------- zuul/layout.yaml | 18 +++++++----------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/jenkins/jobs/oslo.yaml b/jenkins/jobs/oslo.yaml index 025c2cb034..91edb042b0 100644 --- a/jenkins/jobs/oslo.yaml +++ b/jenkins/jobs/oslo.yaml @@ -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: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 93deb1d522..c03fd64071 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8151,31 +8151,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 @@ -8183,23 +8183,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 @@ -8207,7 +8207,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 @@ -8215,6 +8215,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 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6ac9be3726..9866954db2 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2036,12 +2036,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).*$ @@ -2054,7 +2050,6 @@ jobs: - name: ^gate-oslo.messaging-dsvm-functional-.*-zeromq-.*$ branch: ^(?!stable/liberty).*$ - voting: false - name: gate-oslo.log-src-grenade-dsvm branch: ^(?!stable/liberty).*$ @@ -12186,14 +12181,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