From ec916a95e9b8eafa118e028116b79edbf2ba77d1 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 16 Jan 2019 14:32:13 -0700 Subject: [PATCH] Add deployment dirs to files rules Change-Id: I1b4d474ba95c93eddda3d96e359977847800b9f7 Related-Blueprint: services-yaml-flattening --- zuul.d/standalone-jobs.yaml | 100 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml index 75ab3f826..9fc050a38 100644 --- a/zuul.d/standalone-jobs.yaml +++ b/zuul.d/standalone-jobs.yaml @@ -86,16 +86,16 @@ - workbooks/ceph-ansible.yaml - tripleo_common/actions/ansible.py # tripleo-heat-templates - - ^(docker|puppet)/services/.*aodh.*$ - - ^(docker|puppet)/services/.*ceilometer.*$ - - ^(docker|puppet)/services/.*ceph.*$ - - ^(docker|puppet)/services/.*cinder.*$ - - ^(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|deployment)/.*aodh.*$ + - ^((docker|puppet)/services|deployment)/.*ceilometer.*$ + - ^((docker|puppet)/services|deployment)/.*ceph.*$ + - ^((docker|puppet)/services|deployment)/.*cinder.*$ + - ^((docker|puppet)/services|deployment)/.*glance.*$ + - ^((docker|puppet)/services|deployment)/.*gnocchi.*$ + - ^((docker|puppet)/services|deployment)/.*logging.*$ + - ^((docker|puppet)/services|deployment)/.*metrics.*$ + - ^((docker|puppet)/services|deployment)/.*monitoring.*$ + - ^((docker|puppet)/services|deployment)/.*panko.*$ - ci/environments/scenario001-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -124,16 +124,16 @@ - workbooks/ceph-ansible.yaml - tripleo_common/actions/ansible.py # tripleo-heat-templates - - ^(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.*$ + - ^((docker|puppet)/services|deployment)/.*aodh.*$ + - ^((docker|puppet)/services|deployment)/.*barbican.*$ + - ^((docker|puppet)/services|deployment)/.*ceilometer.*$ + - ^((docker|puppet)/services|deployment)/.*cinder.*$ + - ^((docker|puppet)/services|deployment)/.*ec2-api.*$ + - ^((docker|puppet)/services|deployment)/.*glance.*$ + - ^((docker|puppet)/services|deployment)/.*gnocchi.*$ + - ^((docker|puppet)/services|deployment)/.*panko.*$ + - ^((docker|puppet)/services|deployment)/.*swift.*$ + - ^((docker|puppet)/services|deployment)/.*zaqar.*$ - ci/environments/scenario002-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -159,10 +159,10 @@ - ^container-images/.*$ - tripleo_common/image/kolla_builder.py # tripleo-heat-templates - - ^(docker|puppet)/services/.*designate.*$ - - ^(docker|puppet)/services/.*glance.*$ - - ^(docker|puppet)/services/.*mistral.*$ - - ^(docker|puppet)/services/.*sahara.*$ + - ^((docker|puppet)/services|deployment)/.*designate.*$ + - ^((docker|puppet)/services|deployment)/.*glance.*$ + - ^((docker|puppet)/services|deployment)/.*mistral.*$ + - ^((docker|puppet)/services|deployment)/.*sahara.*$ - ci/environments/scenario003-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -186,9 +186,9 @@ - tripleo_common/image/kolla_builder.py - zuul.d/layout.yaml # tripleo-heat-templates - - ^docker/services/ceph.*$ - - ^docker/services/glance.*$ - - ^docker/services/manila.*$ + - ^(docker/services|deployment)/ceph.*$ + - ^(docker/services|deployment)/glance.*$ + - ^(docker/services|deployment)/manila.*$ - ci/environments/scenario004-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -212,16 +212,16 @@ - workbooks/ceph-ansible.yaml - tripleo_common/actions/ansible.py # tripleo-heat-templates - - ^(docker|puppet)/services/.*aodh.*$ - - ^(docker|puppet)/services/.*ceilometer.*$ - - ^(docker|puppet)/services/.*ceph.*$ - - ^(docker|puppet)/services/.*cinder.*$ - - ^(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|deployment)/.*aodh.*$ + - ^((docker|puppet)/services|deployment)/.*ceilometer.*$ + - ^((docker|puppet)/services|deployment)/.*ceph.*$ + - ^((docker|puppet)/services|deployment)/.*cinder.*$ + - ^((docker|puppet)/services|deployment)/.*glance.*$ + - ^((docker|puppet)/services|deployment)/.*gnocchi.*$ + - ^((docker|puppet)/services|deployment)/.*logging.*$ + - ^((docker|puppet)/services|deployment)/.*metrics.*$ + - ^((docker|puppet)/services|deployment)/.*monitoring.*$ + - ^((docker|puppet)/services|deployment)/.*panko.*$ - ci/environments/scenario001-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -250,16 +250,16 @@ - workbooks/ceph-ansible.yaml - tripleo_common/actions/ansible.py # tripleo-heat-templates - - ^(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.*$ + - ^((docker|puppet)/services|deployment)/.*aodh.*$ + - ^((docker|puppet)/services|deployment)/.*barbican.*$ + - ^((docker|puppet)/services|deployment)/.*ceilometer.*$ + - ^((docker|puppet)/services|deployment)/.*cinder.*$ + - ^((docker|puppet)/services|deployment)/.*ec2-api.*$ + - ^((docker|puppet)/services|deployment)/.*glance.*$ + - ^((docker|puppet)/services|deployment)/.*gnocchi.*$ + - ^((docker|puppet)/services|deployment)/.*panko.*$ + - ^((docker|puppet)/services|deployment)/.*swift.*$ + - ^((docker|puppet)/services|deployment)/.*zaqar.*$ - ci/environments/scenario002-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$ @@ -288,9 +288,9 @@ - tripleo_common/image/kolla_builder.py - zuul.d/layout.yaml # tripleo-heat-templates - - ^docker/services/ceph.*$ - - ^docker/services/glance.*$ - - ^docker/services/manila.*$ + - ^(docker/services|deployment)/ceph.*$ + - ^(docker/services|deployment)/glance.*$ + - ^(docker/services|deployment)/manila.*$ - ci/environments/scenario004-standalone.yaml - ^environments\/.*.yaml - ^deployed-server/.*$