From 8f955f7edbb4ca29f6700c728f70f3336d40d7eb Mon Sep 17 00:00:00 2001 From: Nate Johnston Date: Mon, 14 Nov 2016 16:37:52 +0000 Subject: [PATCH] Make neutron-fwaas grenade job voting Make the neutron-fwaas grenade job voting. Also, a few multinode jobs that were added did not have the ubuntu-xenial-2-node node selected, so fix that. Change-Id: I0b3a2d80f4b0f6e49048f8bf0ba9349b7512877f --- grafana/neutron-fwaas.yaml | 2 +- jenkins/jobs/projects.yaml | 8 ++++---- zuul/layout.yaml | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/grafana/neutron-fwaas.yaml b/grafana/neutron-fwaas.yaml index 635d66015b..48fe0bc1a3 100644 --- a/grafana/neutron-fwaas.yaml +++ b/grafana/neutron-fwaas.yaml @@ -26,7 +26,7 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-docs-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-docs-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-docs') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-pep8-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-pep8-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-pep8') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-dsvm-functional.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-dsvm-functional.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-dsvm-functional') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-fwaas-multinode-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-fwaas-multinode-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-fwaas-multinode') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-fwaas-multinode.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-fwaas-multinode.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-fwaas-multinode') type: graph - title: Tempest Failure Rates (check) span: 4 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 31cecafbf2..ca70016942 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -7956,14 +7956,14 @@ job-suffix: '' - '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}': pipeline: gate - node: ubuntu-xenial + node: ubuntu-xenial-2-node branch-designator: '' branch-override: default fwaas-version: v2 job-suffix: '-nv' - '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}': pipeline: gate - node: ubuntu-xenial + node: ubuntu-xenial-2-node branch-designator: '' branch-override: default fwaas-version: v1 @@ -7971,9 +7971,9 @@ - periodic-python-jobs-with-neutron-lib-master - '{pipeline}-grenade-dsvm-neutron-fwaas-multinode{job-suffix}': pipeline: gate - node: ubuntu-trusty-2-node + node: ubuntu-xenial-2-node branch-override: default - job-suffix: '-nv' + job-suffix: '' - project: name: neutron-lbaas diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3bb2e736f0..2d2d5dbc24 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -12134,11 +12134,12 @@ projects: - gate-neutron-fwaas-v1-dsvm-tempest - gate-neutron-fwaas-legacy-dsvm-tempest - gate-neutron-fwaas-dsvm-functional - - gate-grenade-dsvm-neutron-fwaas-multinode-nv + - gate-grenade-dsvm-neutron-fwaas-multinode gate: - gate-neutron-fwaas-v1-dsvm-tempest - gate-neutron-fwaas-legacy-dsvm-tempest - gate-neutron-fwaas-dsvm-functional + - gate-grenade-dsvm-neutron-fwaas-multinode post: - neutron-fwaas-coverage-ubuntu-trusty - neutron-fwaas-coverage-ubuntu-xenial