From fadc636d9e9016af617eabbaaad9c1fb4f276802 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 21 Apr 2014 13:07:50 -0400 Subject: [PATCH] reorder -icehouse branch limits the -icehouse job branch limits were declared too late in the layout.yaml causing them to have the unintended side effect of making all -icehouse jobs voting (overriding earlier non-voting stanzas). move this to the top of the stack to ensure that we get the behavior we were expecting. Change-Id: I44ab42f2e405cc5c3e2cee5ba1f5afa85c39b8ee --- modules/openstack_project/files/zuul/layout.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 2186f64caf..c0d19d262f 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -333,6 +333,10 @@ project-templates: jobs: - name: ^.*$ parameter-function: single_use_node + # tempest and d-g branchless tests need to only run on master + # (needs to be early to not impact non-voting stanzas later) + - name: ^.*(-icehouse|-havana)$ + branch: ^master.*$ # jobs run on the proposal worker - name: ^.*(merge-release-tags|(propose|upstream)-(requirements|translation)-updates?)$ parameter-function: reusable_node @@ -394,9 +398,6 @@ jobs: voting: false - name: check-tempest-dsvm-cells-full voting: false - # tempest and d-g branchless tests need to only run on master - - name: ^.*(-icehouse|-havana)$ - branch: ^master.*$ # For Gerrit ver 2.4.x (using maven) - name: ^(gate|check)-gerrit-unittests$ branch: ^openstack/2\.4.*$