From bea83b51674dc575aec30a0cd837bdb961c3caca Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 7 Nov 2016 13:20:32 -0700 Subject: [PATCH] Fix scenario004 gates for newton 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 --- zuul/layout.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 7968bb6f64..71f1f02573 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -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