Merge "Fix scenario004 gates for newton"

This commit is contained in:
Jenkins
2016-11-07 22:33:06 +00:00
committed by Gerrit Code Review

View File

@@ -1698,10 +1698,6 @@ jobs:
- name: ^gate-puppet-openstack-integration-3-scenario00(1|2)-tempest-ubuntu-trusty$
branch: ^(stable/(liberty|mitaka|hammer)).*$
# puppet-integration scenario004 was introduced after Newton (OpenStack) and Hammer (Ceph).
- name: ^gate-puppet-openstack-integration-(3|4)-scenario004.*$
branch: ^(?!stable/(liberty|mitaka|newton|hammer)).*$
# puppet-integration scenario003 was introduced after Liberty (OpenStack) but we stop to
# test Trusty after Mitaka.
- name: ^gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty$
@@ -1743,6 +1739,10 @@ jobs:
- name: ^gate-puppet-openstack-integration-4-.*$
branch: ^(?!stable/(liberty|mitaka|hammer)).*$
# puppet-integration scenario004 was introduced after Newton (OpenStack) and Hammer (Ceph).
- name: ^gate-puppet-openstack-integration-(3|4)-scenario004.*$
branch: ^(?!stable/(liberty|mitaka|newton|hammer)).*$
- name: gate-requirements-python34
branch: master
voting: false