From 4a309b3a7ec1961e2875053794cac716be13e0b3 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 3 Mar 2017 22:54:57 -0500 Subject: [PATCH] Organize playbooks folder As we start to grow our playbooks, start grouping them by directories. Change-Id: I487023a7a5e7dccb24843cc4a85f7f9c71c10a83 Signed-off-by: Paul Belanger --- .zuul.yaml | 12 ++++++++---- playbooks/{base-post.yaml => base/post.yaml} | 0 playbooks/{base-pre.yaml => base/pre.yaml} | 0 playbooks/base/roles | 1 + playbooks/{tox-cover.yaml => tox/cover.yaml} | 0 playbooks/{tox-docs.yaml => tox/docs.yaml} | 0 playbooks/{tox-linters.yaml => tox/linters.yaml} | 0 playbooks/{tox-post.yaml => tox/post.yaml} | 0 playbooks/{tox-pre.yaml => tox/pre.yaml} | 0 playbooks/{tox-py27.yaml => tox/py27.yaml} | 0 playbooks/tox/roles | 1 + 11 files changed, 10 insertions(+), 4 deletions(-) rename playbooks/{base-post.yaml => base/post.yaml} (100%) rename playbooks/{base-pre.yaml => base/pre.yaml} (100%) create mode 120000 playbooks/base/roles rename playbooks/{tox-cover.yaml => tox/cover.yaml} (100%) rename playbooks/{tox-docs.yaml => tox/docs.yaml} (100%) rename playbooks/{tox-linters.yaml => tox/linters.yaml} (100%) rename playbooks/{tox-post.yaml => tox/post.yaml} (100%) rename playbooks/{tox-pre.yaml => tox/pre.yaml} (100%) rename playbooks/{tox-py27.yaml => tox/py27.yaml} (100%) create mode 120000 playbooks/tox/roles diff --git a/.zuul.yaml b/.zuul.yaml index 98021a775c..847d9e7df2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,7 @@ - job: name: base - pre-run: base-pre - post-run: base-post + pre-run: base/pre + post-run: base/post success-url: http://zuulv3-dev.openstack.org/logs/{build.uuid}/ failure-url: http://zuulv3-dev.openstack.org/logs/{build.uuid}/ timeout: 1800 @@ -14,25 +14,29 @@ - job: name: tox parent: base - pre-run: tox-pre - post-run: tox-post + pre-run: tox/pre + post-run: tox/post - job: name: tox-cover parent: tox + run: tox/cover voting: false - job: name: tox-docs parent: tox + run: tox/docs - job: name: tox-linters parent: tox + run: tox/docs - job: name: tox-py27 parent: tox + run: tox/py27 - project: name: openstack-infra/zuul diff --git a/playbooks/base-post.yaml b/playbooks/base/post.yaml similarity index 100% rename from playbooks/base-post.yaml rename to playbooks/base/post.yaml diff --git a/playbooks/base-pre.yaml b/playbooks/base/pre.yaml similarity index 100% rename from playbooks/base-pre.yaml rename to playbooks/base/pre.yaml diff --git a/playbooks/base/roles b/playbooks/base/roles new file mode 120000 index 0000000000..7b9ade87ed --- /dev/null +++ b/playbooks/base/roles @@ -0,0 +1 @@ +../roles/ \ No newline at end of file diff --git a/playbooks/tox-cover.yaml b/playbooks/tox/cover.yaml similarity index 100% rename from playbooks/tox-cover.yaml rename to playbooks/tox/cover.yaml diff --git a/playbooks/tox-docs.yaml b/playbooks/tox/docs.yaml similarity index 100% rename from playbooks/tox-docs.yaml rename to playbooks/tox/docs.yaml diff --git a/playbooks/tox-linters.yaml b/playbooks/tox/linters.yaml similarity index 100% rename from playbooks/tox-linters.yaml rename to playbooks/tox/linters.yaml diff --git a/playbooks/tox-post.yaml b/playbooks/tox/post.yaml similarity index 100% rename from playbooks/tox-post.yaml rename to playbooks/tox/post.yaml diff --git a/playbooks/tox-pre.yaml b/playbooks/tox/pre.yaml similarity index 100% rename from playbooks/tox-pre.yaml rename to playbooks/tox/pre.yaml diff --git a/playbooks/tox-py27.yaml b/playbooks/tox/py27.yaml similarity index 100% rename from playbooks/tox-py27.yaml rename to playbooks/tox/py27.yaml diff --git a/playbooks/tox/roles b/playbooks/tox/roles new file mode 120000 index 0000000000..7b9ade87ed --- /dev/null +++ b/playbooks/tox/roles @@ -0,0 +1 @@ +../roles/ \ No newline at end of file