From 6abc773278fda89b5cf1d54dca23fbd264c4924e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 1 Jun 2012 11:39:08 -0700 Subject: [PATCH] Use meta-jobs. Needs these changes to be installed and running first: https://review.openstack.org/#/c/8052/ https://review.openstack.org/#/c/8053/ Change-Id: Ic243d148797f1b27d3c95282d1a1347a57fbbe50 --- modules/openstack-ci-config/files/zuul/layout.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml index be775b7298..abb1c703ed 100644 --- a/modules/openstack-ci-config/files/zuul/layout.yaml +++ b/modules/openstack-ci-config/files/zuul/layout.yaml @@ -1,4 +1,4 @@ -queue: +queues: - name: check manager: IndependentQueueManager trigger: @@ -25,11 +25,7 @@ queue: ref: ^(?!refs/).*$ jobs: - - name: gate-zuul-merge - failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. - - name: gate-pypi-mirror-merge - failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. - - name: gate-gerrit-merge + - name: ^.*-merge$ failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. projects: