Merge "Add bionic job to elk_metrics_6x testing"

elk_metrics_6x/roles/elastic_apm_server/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_curator/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_dependencies/meta/main.yml

@@ -24,6 +24,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_filebeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_kibana/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_logstash/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_repositories/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_retention/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elastic_rollup/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/elasticsearch/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

elk_metrics_6x/roles/go_install_1.10/meta/main.yml

@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
+        - bionic
   categories:
     - cloud
     - development

zuul.d/jobs.yaml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - job:
-    name: "openstack-ansible-ops:elk_metrics_6x"
+    name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
     parent: base
     description: "Runs a gate test on the elk_metrics_6x project."
     run: "elk_metrics_6x/tests/test.yml"
@@ -23,3 +23,21 @@
       - ^elk_metrics_6x/.*
     vars:
       osa_test_repo: "openstack/openstack-ansible-ops"
+
+# - job:
+#     name: "openstack-ansible-ops:elk_metrics_6x-centos-7"
+#     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+#     nodeset: centos-7
+#     voting: false
+#
+# - job:
+#     name: "openstack-ansible-ops:elk_metrics_6x-opensuse-423"
+#     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+#     nodeset: opensuse-423
+#     voting: false
+
+- job:
+    name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
+    parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+    nodeset: ubuntu-bionic
+    voting: false

zuul.d/project.yaml

@@ -17,7 +17,8 @@
       - openstack-ansible-role-jobs
     check:
       jobs:
-        - "openstack-ansible-ops:elk_metrics_6x"
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
     gate:
       jobs:
-        - "openstack-ansible-ops:elk_metrics_6x"
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"