From aad13b822b901e679d0489d9db9111a2e0672e6a Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 26 Mar 2019 20:15:59 +0000
Subject: [PATCH] Add telemetry service bundle to AIO tests

In order to test the telemetry service bundle across all
the roles concerned, we add them with a specific bundle
name in the AIO bootstrap.

As part of this, we move the special word list into a var
to make it easier to read and maintain.

Change-Id: Ibc4d83563eb303f1829daf3f93d35dcb1d23982b
---
 tests/roles/bootstrap-host/vars/main.yml | 16 +++++++++++++++-
 zuul.d/jobs.yaml                         | 24 ++++++++++++++++++++++++
 zuul.d/project-templates.yaml            | 14 ++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/tests/roles/bootstrap-host/vars/main.yml b/tests/roles/bootstrap-host/vars/main.yml
index cc1214ac59..645b3ed32a 100644
--- a/tests/roles/bootstrap-host/vars/main.yml
+++ b/tests/roles/bootstrap-host/vars/main.yml
@@ -13,10 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+bootstrap_host_special_word_list:
+ - aio
+ - distro
+ - lxc
+ - metal
+ - nspawn
+ - proxy
+ - source
+ - telemetry
+ - translations
+
 bootstrap_host_services: >-
   {%- set scenario_list = (bootstrap_host_scenario.split('_') | reject('equalto', '')) | list %}
   {%- set service_list = ['keystone'] %}
-  {%- set service_list_extra = scenario_list | difference(['aio', 'distro', 'lxc', 'nspawn', 'metal', 'source', 'translations', 'proxy']) %}
+  {%- set service_list_extra = scenario_list | difference(bootstrap_host_special_word_list) %}
   {%- if 'metal' not in scenario_list %}
   {%-   set _ = service_list.append('haproxy') %}
   {%- endif %}
@@ -29,6 +40,9 @@ bootstrap_host_services: >-
   {%- if 'ironic' in scenario_list %}
   {%-   set _ = service_list.extend(['swift']) %}
   {%- endif %}
+  {%- if 'telemetry' in scenario_list %}
+  {%-   set _ = service_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %}
+  {%- endif %}
   {%- if 'translations' in scenario_list %}
   {%-   set _ = service_list.extend(['designate', 'heat', 'magnum', 'sahara', 'swift', 'trove']) %}
   {%- endif %}
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9e9abb193b..496e272ef0 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -119,6 +119,14 @@
       action: deploy
       scenario: aio_metal
 
+- job:
+    name: openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_telemetry_metal
+
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-ubuntu-bionic
     parent: openstack-ansible-deploy-aio
@@ -224,6 +232,14 @@
       actio: deploy
       scenario: aio_metal
 
+- job:
+    name: openstack-ansible-deploy-aio_telemetry_metal-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_telemetry_metal
+
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-centos-7
     parent: openstack-ansible-deploy-aio
@@ -287,6 +303,14 @@
       action: deploy
       scenario: aio_metal
 
+- job:
+    name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_telemetry_metal
+
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-opensuse-150
     parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index e1ef7a66e8..c616ce28f3 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -79,6 +79,20 @@
       jobs:
         - openstack-ansible-deploy-aio_metal-opensuse-150
 
+- project-template:
+    name: openstack-ansible-deploy-aio_telemetry_metal-jobs
+    check:
+      jobs:
+        - openstack-ansible-deploy-aio_telemetry_metal-centos-7
+        - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
+    gate:
+      jobs:
+        - openstack-ansible-deploy-aio_telemetry_metal-centos-7
+        - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
+    experimental:
+      jobs:
+        - openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+
 - project-template:
     name: openstack-ansible-deploy-aio_distro_metal-jobs
     check: