From 12141d96e0bce33c7cc96a218ca8100bb284f63f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 19 Sep 2017 16:08:20 +0000 Subject: [PATCH] Revert "neutron: Make grenade-neutron-dvr-multinode job non-voting" This reverts commit 424448eb8bbe5894b8aabff509c8bb08c29be733. Also doing the same for zuulv3 setup. While at it, also remove Mitaka part of the regex since the branch is long dead. Change-Id: I4971bc5ef60289e0e54c9eb3a5279cd4ff390cb3 --- grafana/neutron.yaml | 3 ++- zuul.d/projects.yaml | 15 +++++++++++++-- zuul/layout.yaml | 3 ++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml index c41f71abab..94853213de 100644 --- a/grafana/neutron.yaml +++ b/grafana/neutron.yaml @@ -51,6 +51,7 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-multinode-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-multinode-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-multinode-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-multinode-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-multinode-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-multinode-ubuntu-xenial') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial') type: graph - title: API/Functional/Fullstack Failure Rates/KeystoneV3 (Check queue) span: 4 @@ -85,7 +86,7 @@ dashboard: span: 4 targets: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-multinode-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-multinode-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-multinode-ubuntu-xenial') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial-nv') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial') type: graph - title: Rally Failure Rates span: 4 diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 6efc70fdf6..919f896a51 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -16735,8 +16735,7 @@ - ^tools/.*$ - ^tox.ini$ - legacy-grenade-dsvm-neutron-dvr-multinode: - voting: false - branches: ^(?!(driverfixes|stable/(mitaka|newton))).*$ + branches: ^(?!(driverfixes|stable/newton)).*$ irrelevant-files: - ^(test-|)requirements.txt$ - ^.*\.rst$ @@ -16904,6 +16903,18 @@ - ^setup.cfg$ - ^tools/.*$ - ^tox.ini$ + - legacy-grenade-dsvm-neutron-dvr-multinode: + branches: ^(?!(driverfixes|stable/newton)).*$ + irrelevant-files: + - ^(test-|)requirements.txt$ + - ^.*\.rst$ + - ^doc/.*$ + - ^neutron/locale/.*$ + - ^neutron/tests/unit/.*$ + - ^releasenotes/.*$ + - ^setup.cfg$ + - ^tools/.*$ + - ^tox.ini$ - legacy-tempest-dsvm-neutron-full: branches: ^(?!driverfixes/).*$ irrelevant-files: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 67a2f24168..06a38b64f5 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -12586,7 +12586,7 @@ projects: - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial - - gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial-nv + - gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial - gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv - gate-tempest-dsvm-neutron-dvr-ha-multinode-full-ubuntu-xenial-nv - gate-tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa-ubuntu-xenial-nv @@ -12601,6 +12601,7 @@ projects: - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial + - gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial post: - neutron-coverage-ubuntu-xenial experimental: