Fix zuul layout order for tripleo scenarios

Zuul layout order wasn't correct for tripleo scenarios, the jobs were
still running on stable/hammer branch because the rule was overriden by
the rule moved in this patch.

Moving this 'general' rule before specific rules makes the layout safer
so we first define the general rule and then the specific rules for the rest.

Change-Id: I77c342d57302c0e6a0d550e3a211b06190fd4666
This commit is contained in:
Emilien Macchi 2016-12-16 15:00:47 -05:00
parent a319693ea5
commit 68f07a4ee2

View File

@ -1575,6 +1575,10 @@ jobs:
- ^.*\.rst$
- ^doc/.*$
# tripleo multinode and undercloud jobs were introduced during Newton cycle.
- name: ^gate-tripleo-ci-.*(multinode|undercloud).*$
branch: ^(?!stable/(liberty|mitaka)).*$
# tripleo multinode jobs run in Puppet CI are only supported from Ocata.
- name : ^gate-tripleo-ci-centos-7-scenario.*-multinode-puppet.*$
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
@ -1585,10 +1589,6 @@ jobs:
- ^releasenotes/.*$
- ^metadata.json$
# tripleo multinode and undercloud jobs were introduced during Newton cycle.
- name: ^gate-tripleo-ci-.*(multinode|undercloud).*$
branch: ^(?!stable/(liberty|mitaka)).*$
# NOTE(emilien): zuul v2 does not allow us to specify files rules for specific projects
# and are global to the jobname.
# It will be done with zuul v3: