From 995217f18eacaed3181b50bd9012828e48763669 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 29 Nov 2017 22:08:20 -0800 Subject: [PATCH] zuul: run container jobs when touching puppet services puppet services can break container jobs since they're still used by docker services. Change-Id: Ifdbede287b546a3b80086f56bc9bed95099ce433 --- zuul.d/layout.yaml | 80 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 37adc4be43..4ff7d591fe 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -36,18 +36,18 @@ - ^environments\/.*.yaml - tripleo-ci-centos-7-scenario001-multinode-oooq-container: files: - - ^docker/services/aodh.*$ - - ^docker/services/ceilometer.*$ - - ^docker/services/ceph.*$ - - ^docker/services/cinder.*$ - - ^docker/services/congress.*$ - - ^docker/services/glance.*$ - - ^docker/services/gnocchi.*$ - - ^docker/services/logging.*$ - - ^docker/services/metrics.*$ - - ^docker/services/monitoring.*$ - - ^docker/services/panko.*$ - - ^docker/services/tacker.*$ + - ^(docker|puppet)/services/aodh.*$ + - ^(docker|puppet)/services/ceilometer.*$ + - ^(docker|puppet)/services/ceph.*$ + - ^(docker|puppet)/services/cinder.*$ + - ^(docker|puppet)/services/congress.*$ + - ^(docker|puppet)/services/glance.*$ + - ^(docker|puppet)/services/gnocchi.*$ + - ^(docker|puppet)/services/logging.*$ + - ^(docker|puppet)/services/metrics.*$ + - ^(docker|puppet)/services/monitoring.*$ + - ^(docker|puppet)/services/panko.*$ + - ^(docker|puppet)/services/tacker.*$ - ci/environments/scenario001-multinode-containers.yaml - ci/pingtests/scenario001.*$ - ^environments\/.*.yaml @@ -68,16 +68,16 @@ - ^environments\/.*.yaml - tripleo-ci-centos-7-scenario002-multinode-oooq-container: files: - - ^docker/services/aodh.*$ - - ^docker/services/barbican.*$ - - ^docker/services/ceilometer.*$ - - ^docker/services/cinder.*$ - - ^docker/services/ec2-api.*$ - - ^docker/services/glance.*$ - - ^docker/services/gnocchi.*$ - - ^docker/services/panko.*$ - - ^docker/services/swift.*$ - - ^docker/services/zaqar.*$ + - ^(docker|puppet)/services/aodh.*$ + - ^(docker|puppet)/services/barbican.*$ + - ^(docker|puppet)/services/ceilometer.*$ + - ^(docker|puppet)/services/cinder.*$ + - ^(docker|puppet)/services/ec2-api.*$ + - ^(docker|puppet)/services/glance.*$ + - ^(docker|puppet)/services/gnocchi.*$ + - ^(docker|puppet)/services/panko.*$ + - ^(docker|puppet)/services/swift.*$ + - ^(docker|puppet)/services/zaqar.*$ - ci/environments/scenario002-multinode-containers.yaml - ci/pingtests/scenario002.*$ - ^environments\/.*.yaml @@ -91,9 +91,9 @@ - ^environments\/.*.yaml - tripleo-ci-centos-7-scenario003-multinode-oooq-container: files: - - ^docker/services/glance.*$ - - ^docker/services/mistral.*$ - - ^docker/services/sahara.*$ + - ^(docker|puppet)/services/glance.*$ + - ^(docker|puppet)/services/mistral.*$ + - ^(docker|puppet)/services/sahara.*$ - ci/environments/scenario003-multinode-containers.yaml - ci/pingtests/scenario003.*$ - ^environments\/.*.yaml @@ -123,7 +123,7 @@ files: - ci/environments/scenario007-multinode-containers.yaml - ci/pingtests/scenario007-multinode.yaml - - ^docker/services/.*ovn.*$ + - ^(docker|puppet)/services/.*ovn.*$ - ^environments\/.*.yaml gate: queue: tripleo @@ -145,16 +145,16 @@ - ^environments\/.*.yaml - tripleo-ci-centos-7-scenario002-multinode-oooq-container: files: - - ^docker/services/aodh.*$ - - ^docker/services/barbican.*$ - - ^docker/services/ceilometer.*$ - - ^docker/services/cinder.*$ - - ^docker/services/ec2-api.*$ - - ^docker/services/glance.*$ - - ^docker/services/gnocchi.*$ - - ^docker/services/panko.*$ - - ^docker/services/swift.*$ - - ^docker/services/zaqar.*$ + - ^(docker|puppet)/services/aodh.*$ + - ^(docker|puppet)/services/barbican.*$ + - ^(docker|puppet)/services/ceilometer.*$ + - ^(docker|puppet)/services/cinder.*$ + - ^(docker|puppet)/services/ec2-api.*$ + - ^(docker|puppet)/services/glance.*$ + - ^(docker|puppet)/services/gnocchi.*$ + - ^(docker|puppet)/services/panko.*$ + - ^(docker|puppet)/services/swift.*$ + - ^(docker|puppet)/services/zaqar.*$ - ci/environments/scenario002-multinode-containers.yaml - ci/pingtests/scenario002.*$ - ^environments\/.*.yaml @@ -168,9 +168,9 @@ - ^environments\/.*.yaml - tripleo-ci-centos-7-scenario004-multinode-oooq-container: files: - - ^docker/services/ceph.*$ - - ^docker/services/glance.*$ - - ^docker/services/manila.*$ + - ^(docker|puppet)/services/ceph.*$ + - ^(docker|puppet)/services/glance.*$ + - ^(docker|puppet)/services/manila.*$ - ci/environments/scenario004-multinode-containers.yaml - ci/pingtests/scenario004.*$ - ^environments\/.*.yaml @@ -184,7 +184,7 @@ files: - ci/environments/scenario007-multinode-containers.yaml - ci/pingtests/scenario007-multinode.yaml - - ^docker/services/.*ovn.*$ + - ^(docker|puppet)/services/.*ovn.*$ - ^environments\/.*.yaml experimental: jobs: