Merge "Remove the job for networking-ofagent master branch"

This commit is contained in:
Jenkins 2016-04-16 07:47:46 +00:00 committed by Gerrit Code Review
commit 3c2eee0a37
2 changed files with 5 additions and 6 deletions
jenkins/jobs
zuul

@ -3611,11 +3611,6 @@
node: ubuntu-trusty
job-suffix: ''
branch-override: default
- '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}':
pipeline: periodic
node: ubuntu-trusty
job-suffix: '-master'
branch-override: master
- '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}':
pipeline: periodic
node: ubuntu-trusty

@ -2411,6 +2411,10 @@ jobs:
branch: ^(?!stable/(kilo|liberty)).*$
# TODO(yamamoto): Revisit when Neutron driver API become more stable.
# OFAgent will be removed in the Newton cycle.
- name: ^gate-networking-ofagent-.*$
branch: ^(?!master)$
- name: gate-networking-ofagent-python27
voting: false
@ -2422,6 +2426,7 @@ jobs:
tags: neutron
- name: gate-tempest-dsvm-networking-ofagent
branch: ^(?!master)$
voting: false
- name: ^gate-tempest-dsvm-neutron.*-ovs.*$
@ -7589,7 +7594,6 @@ projects:
- gate-networking-ofagent-docs
- gate-networking-ofagent-pep8
periodic:
- periodic-tempest-dsvm-networking-ofagent-master
- periodic-tempest-dsvm-networking-ofagent-mitaka
- periodic-tempest-dsvm-networking-ofagent-liberty
- periodic-tempest-dsvm-networking-ofagent-kilo