commit 869fe2c804c12da5f224856e9b0e08efa122f358
author Zuul <zuul@review.openstack.org> Tue Jan 30 18:01:20 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 30 18:01:20 2018 +0000
tree fc355cd7f555c528419defc735ba874bc8738699
parent 97c42afccc32042ef3be4c4c4ebf01196d36633f
parent 795dae5249640ffba467b47b506c84c7676b34b6

Merge "Remove unnecessary dir 'legacy'"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index bf3b91f..387c042 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -33,36 +33,36 @@
 - job:
     name: patrole-admin
     parent: patrole-base
-    run: playbooks/legacy/patrole-admin/run.yaml
-    post-run: playbooks/legacy/patrole-admin/post.yaml
+    run: playbooks/patrole-admin/run.yaml
+    post-run: playbooks/patrole-admin/post.yaml
 
 - job:
     name: patrole-member
     parent: patrole-base
-    run: playbooks/legacy/patrole-member/run.yaml
-    post-run: playbooks/legacy/patrole-member/post.yaml
+    run: playbooks/patrole-member/run.yaml
+    post-run: playbooks/patrole-member/post.yaml
 
 - job:
     name: patrole-multinode-admin
     parent: patrole-base-multinode
-    run: playbooks/legacy/patrole-multinode-admin/run.yaml
-    post-run: playbooks/legacy/patrole-multinode-admin/post.yaml
+    run: playbooks/patrole-multinode-admin/run.yaml
+    post-run: playbooks/patrole-multinode-admin/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
     name: patrole-multinode-member
     parent: patrole-base-multinode
-    run: playbooks/legacy/patrole-multinode-member/run.yaml
-    post-run: playbooks/legacy/patrole-multinode-member/post.yaml
+    run: playbooks/patrole-multinode-member/run.yaml
+    post-run: playbooks/patrole-multinode-member/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
     name: patrole-py35-member
     parent: patrole-base
-    run: playbooks/legacy/patrole-py35-member/run.yaml
-    post-run: playbooks/legacy/patrole-py35-member/post.yaml
+    run: playbooks/patrole-py35-member/run.yaml
+    post-run: playbooks/patrole-py35-member/post.yaml
 
 - project:
     check:

playbooks/patrole-admin/post.yaml

diff --git a/playbooks/legacy/patrole-admin/post.yaml b/playbooks/patrole-admin/post.yaml
similarity index 100%
rename from playbooks/legacy/patrole-admin/post.yaml
rename to playbooks/patrole-admin/post.yaml

playbooks/patrole-admin/run.yaml

diff --git a/playbooks/legacy/patrole-admin/run.yaml b/playbooks/patrole-admin/run.yaml
similarity index 100%
rename from playbooks/legacy/patrole-admin/run.yaml
rename to playbooks/patrole-admin/run.yaml

playbooks/patrole-member/post.yaml

diff --git a/playbooks/legacy/patrole-member/post.yaml b/playbooks/patrole-member/post.yaml
similarity index 100%
rename from playbooks/legacy/patrole-member/post.yaml
rename to playbooks/patrole-member/post.yaml

playbooks/patrole-member/run.yaml

diff --git a/playbooks/legacy/patrole-member/run.yaml b/playbooks/patrole-member/run.yaml
similarity index 100%
rename from playbooks/legacy/patrole-member/run.yaml
rename to playbooks/patrole-member/run.yaml

playbooks/patrole-multinode-admin/post.yaml

diff --git a/playbooks/legacy/patrole-multinode-admin/post.yaml b/playbooks/patrole-multinode-admin/post.yaml
similarity index 100%
rename from playbooks/legacy/patrole-multinode-admin/post.yaml
rename to playbooks/patrole-multinode-admin/post.yaml

playbooks/patrole-multinode-admin/run.yaml

diff --git a/playbooks/legacy/patrole-multinode-admin/run.yaml b/playbooks/patrole-multinode-admin/run.yaml
similarity index 100%
rename from playbooks/legacy/patrole-multinode-admin/run.yaml
rename to playbooks/patrole-multinode-admin/run.yaml

playbooks/patrole-multinode-member/post.yaml

diff --git a/playbooks/legacy/patrole-multinode-member/post.yaml b/playbooks/patrole-multinode-member/post.yaml
similarity index 100%
rename from playbooks/legacy/patrole-multinode-member/post.yaml
rename to playbooks/patrole-multinode-member/post.yaml

playbooks/patrole-multinode-member/run.yaml

diff --git a/playbooks/legacy/patrole-multinode-member/run.yaml b/playbooks/patrole-multinode-member/run.yaml
similarity index 100%
rename from playbooks/legacy/patrole-multinode-member/run.yaml
rename to playbooks/patrole-multinode-member/run.yaml

playbooks/patrole-py35-member/post.yaml

diff --git a/playbooks/legacy/patrole-py35-member/post.yaml b/playbooks/patrole-py35-member/post.yaml
similarity index 100%
rename from playbooks/legacy/patrole-py35-member/post.yaml
rename to playbooks/patrole-py35-member/post.yaml

playbooks/patrole-py35-member/run.yaml

diff --git a/playbooks/legacy/patrole-py35-member/run.yaml b/playbooks/patrole-py35-member/run.yaml
similarity index 100%
rename from playbooks/legacy/patrole-py35-member/run.yaml
rename to playbooks/patrole-py35-member/run.yaml