From 34c621b179355c8927c040cdeb334459a3de7f40 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Fri, 24 Feb 2017 14:44:01 +0000 Subject: [PATCH] Revert "Make python3 rally job voting in Neutron" This reverts commit 9915e4bfe6e7b711b8366cb36877651aa032ba8e. This is failing due to other projects having python3 failures and is blocking the neutron gate. Closes-Bug: #1667579 Change-Id: I59f1bf5e34cc9ce777746907bd614d86682462be --- jenkins/jobs/projects.yaml | 2 +- zuul/layout.yaml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index b3677f5cdf..1345dc60a3 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -7513,7 +7513,7 @@ telemetry: '0' - gate-rally-dsvm-py35-neutron-{name}-{node}{suffix}: node: ubuntu-xenial - suffix: '' + suffix: '-nv' telemetry: '0' - '{pipeline}-grenade-dsvm-neutron-multinode-{node-release}{suffix}': pipeline: gate diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4883b61167..56493e4f40 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1994,10 +1994,6 @@ jobs: - name: ^gate-tempest-dsvm-neutron-pg-full-ubuntu-(trusty|xenial) voting: false - # non py35 rally xenial job should only run on newton. master is py35 - - name: ^gate-rally-dsvm-neutron-neutron-ubuntu-xenial - branch: ^stable/newton - # scenario tests for neutron-dynamic-routing can be run on ocata and later - name: ^gate-neutron-dynamic-routing-dsvm-tempest-scenario.*$ branch: ^(?!stable/newton).*$ @@ -12255,7 +12251,7 @@ projects: - gate-neutron-dsvm-fullstack-ubuntu-xenial - gate-rally-dsvm-neutron-neutron-ubuntu-trusty - gate-rally-dsvm-neutron-neutron-ubuntu-xenial - - gate-rally-dsvm-py35-neutron-neutron-ubuntu-xenial + - gate-rally-dsvm-py35-neutron-neutron-ubuntu-xenial-nv - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-identity-v3-only-full-ubuntu-xenial-nv