openstack/project-config
Code Issues Proposed changes

Fix scenario004 gates for newton

Browse Source 
The puppet scenario004 does not work until after Newton.  Unfortunately
the job was improperly being added due to the ordering of the matcher.
The puppet4 blanket rule was overriding our disabling of scenario004.
This change fixes the order so that the scenario004 job should only be
active for master (Ocata) and beyond.

Change-Id: Ia8487d27317f5204bc7fc4d92dbe893fc9677aed
This commit is contained in:
Alex Schultz
2016-11-07 13:20:32 -07:00
parent fc7ed604f6
commit bea83b5167
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zuul/layout.yaml
View File

@@ -1696,10 +1696,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$
@@ -1741,6 +1737,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