From 248e5eec0f86bce259cbf63f0fe944e89783e486 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Wed, 16 Aug 2017 18:45:44 +0000 Subject: [PATCH] Revert "Make neutron functional job non-voting" Bug 1709032 has been solved and I'm actively working on bug 1707933. Also stable Pike branch has been already cut, current failure rate on check queue is about ~15%. This reverts commit d5d6dd800f74230faa1210ad7b2c275d74fbb9f3. Change-Id: Icffe9568e9aa36fdfb0e98006b642f3acedf8b9e --- grafana/neutron.yaml | 7 ++++++- jenkins/jobs/projects.yaml | 9 +++++++-- zuul/layout.yaml | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml index d8a2afaa16..7836a84db3 100644 --- a/grafana/neutron.yaml +++ b/grafana/neutron.yaml @@ -57,9 +57,14 @@ dashboard: span: 4 targets: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api-ubuntu-xenial') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial-nv') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-fullstack-ubuntu-xenial') type: graph + - title: Functional Failure Rates (Gate queue) + span: 4 + targets: + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial') + type: graph - title: Coverage Failure Rates (Gate queue) span: 4 targets: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index ea3d6652c8..6ba883d45c 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8045,6 +8045,12 @@ node-release: ubuntu-xenial suffix: '-nv' branch-override: default + - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}': + pipeline: gate + python: '' + node: ubuntu-xenial + suffix: '' + branch-override: default - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}': pipeline: gate python: '-python35' @@ -8057,8 +8063,7 @@ node: ubuntu-xenial suffix: '' branch-override: master - # This job is for cross testing with devstack-gate, and for neutron check - # queue while we are solving instability issues (bugs 1707933, 1709032) + # This job is for cross testing with devstack-gate - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}': pipeline: gate python: '' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b425bd32c5..9236ff60fe 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -12549,7 +12549,7 @@ projects: check: - neutron-coverage-ubuntu-xenial - gate-neutron-dsvm-api-ubuntu-xenial - - gate-neutron-dsvm-functional-ubuntu-xenial-nv + - gate-neutron-dsvm-functional-ubuntu-xenial - gate-neutron-dsvm-fullstack-ubuntu-xenial - gate-rally-dsvm-neutron-neutron-ubuntu-xenial - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial @@ -12567,6 +12567,7 @@ projects: gate: - neutron-coverage-ubuntu-xenial - gate-neutron-dsvm-api-ubuntu-xenial + - gate-neutron-dsvm-functional-ubuntu-xenial - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial