diff --git a/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml b/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml index d24d370c..4f8ef5b4 100644 --- a/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml index 19242323..baefd460 100644 --- a/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_curator/meta/main.yml b/elk_metrics_6x/roles/elastic_curator/meta/main.yml index 0dcd0de2..236fc87f 100644 --- a/elk_metrics_6x/roles/elastic_curator/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_curator/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml b/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml index 6b81d61d..97c92d44 100644 --- a/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml b/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml index 5d1edce5..a1d466fd 100644 --- a/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml @@ -24,6 +24,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml b/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml index 95bb8f59..a3b68c14 100644 --- a/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml index 761d880e..4761a67b 100644 --- a/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml index cc4a5063..b38e1402 100644 --- a/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_kibana/meta/main.yml b/elk_metrics_6x/roles/elastic_kibana/meta/main.yml index 3214fdf3..9736c5c9 100644 --- a/elk_metrics_6x/roles/elastic_kibana/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_kibana/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_logstash/meta/main.yml b/elk_metrics_6x/roles/elastic_logstash/meta/main.yml index f5684dc8..c33cbc49 100644 --- a/elk_metrics_6x/roles/elastic_logstash/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_logstash/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml index 73585980..56942ddd 100644 --- a/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml index c403c434..00721aaa 100644 --- a/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_repositories/meta/main.yml b/elk_metrics_6x/roles/elastic_repositories/meta/main.yml index c3a7f802..094ed533 100644 --- a/elk_metrics_6x/roles/elastic_repositories/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_repositories/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_retention/meta/main.yml b/elk_metrics_6x/roles/elastic_retention/meta/main.yml index f360643a..56c8b899 100644 --- a/elk_metrics_6x/roles/elastic_retention/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_retention/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elastic_rollup/meta/main.yml b/elk_metrics_6x/roles/elastic_rollup/meta/main.yml index 2a2aed2c..bfdc31d8 100644 --- a/elk_metrics_6x/roles/elastic_rollup/meta/main.yml +++ b/elk_metrics_6x/roles/elastic_rollup/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/elasticsearch/meta/main.yml b/elk_metrics_6x/roles/elasticsearch/meta/main.yml index 6010c208..448ea90e 100644 --- a/elk_metrics_6x/roles/elasticsearch/meta/main.yml +++ b/elk_metrics_6x/roles/elasticsearch/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - name: Ubuntu versions: - xenial + - bionic categories: - cloud - development diff --git a/elk_metrics_6x/roles/go_install_1.10/meta/main.yml b/elk_metrics_6x/roles/go_install_1.10/meta/main.yml index 3998985c..05efc49e 100644 --- a/elk_metrics_6x/roles/go_install_1.10/meta/main.yml +++ b/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 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 9218647d..1c448471 100644 --- a/zuul.d/jobs.yaml +++ b/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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 74920d9c..599d54b4 100644 --- a/zuul.d/project.yaml +++ b/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"