Refactor our testing playbooks

As we try to run a windmill in zuul, it doesn't make sense to also run
our testing roles.  For now, we can move these into our prove playbook,
however long term I think we want to move to testinfra. Then people can
decide to also run testinfra against their production control plane.

Change-Id: I783e2e3b5f6fba224d761446c66aa9a58ecec9ca
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

playbooks/gear.yaml

@@ -23,8 +23,3 @@
     - name: Setup openstack.logrotate role.
       include_role:
         name: openstack.logrotate
-
-  post_tasks:
-    - name: Run gear validation.
-      include_role:
-        name: test.gear

playbooks/nodepool-builder.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install nodepool-builder
-  hosts: nodepool-builder:!disabled
-
-  post_tasks:
-    - name: Run nodepool-server validation
-      include_role:
-        name: test.nodepool-builder

playbooks/nodepool-launcher.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install nodepool-launcher
-  hosts: nodepool-launcher:!disabled
-
-  post_tasks:
-    - name: Run nodepool-launcher validation
-      include_role:
-        name: test.nodepool-launcher

playbooks/nodepool.yaml

@@ -66,6 +66,3 @@
     - name: Setup openstack.logrotate role
       include_role:
         name: openstack.logrotate
-
-- import_playbook: nodepool-builder.yaml
-- import_playbook: nodepool-launcher.yaml

playbooks/prove.yaml

@@ -12,6 +12,86 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
+- name: Validate statsd
+  hosts: statsd:!disabled
+
+  tasks:
+    - name: Run statsd validation
+      include_role:
+        name: test.statsd
+
+- name: Validate gear
+  hosts: gear:!disabled
+
+  tasks:
+    - name: Run gear validation
+      include_role:
+        name: test.gear
+
+- name: Validate zookeeper
+  hosts: zookeeper:!disabled
+
+  tasks:
+    - name: Run zookeeper validation
+      include_role:
+        name: test.zookeeper
+
+- name: Validate nodepool-builder
+  hosts: nodepool-builder:!disabled
+
+  tasks:
+    - name: Run nodepool-builder validation
+      include_role:
+        name: test.nodepool-builder
+
+- name: Validate nodepool-launcher
+  hosts: nodepool-launcher:!disabled
+
+  tasks:
+    - name: Run nodepool-launcher validation
+      include_role:
+        name: test.nodepool-launcher
+
+- name: Validate zuul-scheduler
+  hosts: zuul-scheduler:!disabled
+
+  tasks:
+    - name: Run zuul-scheduler validation
+      include_role:
+        name: test.zuul-scheduler
+
+- name: Validate zuul-executor
+  hosts: zuul-executor:!disabled
+
+  tasks:
+    - name: Run zuul-executor validation
+      include_role:
+        name: test.zuul-executor
+
+- name: Validate zuul-fingergw
+  hosts: zuul-fingergw:!disabled
+
+  tasks:
+    - name: Run zuul-fingergw validation
+      include_role:
+        name: test.zuul-fingergw
+
+- name: Validate zuul-merger
+  hosts: zuul-merger:!disabled
+
+  tasks:
+    - name: Run zuul-merger validation
+      include_role:
+        name: test.zuul-merger
+
+- name: Validate zuul-web
+  hosts: zuul-web:!disabled
+
+  tasks:
+    - name: Run zuul-web validation
+      include_role:
+        name: test.zuul-web
+
 - name: Prove our CI tools are working
   hosts: bastion
 

playbooks/statsd.yaml

@@ -23,8 +23,3 @@
     - name: Setup openstack.logrotate role.
       include_role:
         name: openstack.logrotate
-
-  post_tasks:
-    - name: Run statsd validation.
-      include_role:
-        name: test.statsd

playbooks/zookeeper.yaml

@@ -19,8 +19,3 @@
     - name: Setup openstack.zookeeper role
       include_role:
         name: openstack.zookeeper
-
-  post_tasks:
-    - name: Run zookeeper validation
-      include_role:
-        name: test.zookeeper

playbooks/zuul-executor.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install zuul-executor
-  hosts: zuul-executor:!disabled
-
-  post_tasks:
-    - name: Run zuul-executor validation
-      include_role:
-        name: test.zuul-executor

playbooks/zuul-fingergw.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install zuul-fingergw
-  hosts: zuul-fingergw:!disabled
-
-  post_tasks:
-    - name: Run zuul-fingergw validation
-      include_role:
-        name: test.zuul-fingergw

playbooks/zuul-merger.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install zuul-merger
-  hosts: zuul-merger:!disabled
-
-  post_tasks:
-    - name: Run zuul-merger validation
-      include_role:
-        name: test.zuul-merger

playbooks/zuul-scheduler.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install zuul-scheduler
-  hosts: zuul-scheduler:!disabled
-
-  post_tasks:
-    - name: Run zuul-scheduler validation
-      include_role:
-        name: test.zuul-scheduler

playbooks/zuul-web.yaml

@@ -1,21 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Install zuul-web
-  hosts: zuul-web:!disabled
-
-  post_tasks:
-    - name: Run zuul-web validation
-      include_role:
-        name: test.zuul-web

playbooks/zuul.yaml

@@ -73,9 +73,3 @@
     - name: Setup openstack.nginx role
       include_role:
         name: openstack.nginx
-
-- import_playbook: zuul-scheduler.yaml
-- import_playbook: zuul-executor.yaml
-- import_playbook: zuul-fingergw.yaml
-- import_playbook: zuul-merger.yaml
-- import_playbook: zuul-web.yaml