Merge "aodh: run MySQL and PostgreSQL jobs on Xenial starting with Ocata"

jenkins/jobs/aodh.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-aodh-dsvm-functional-{backend}'
+    name: '{pipeline}-aodh-dsvm-functional-{backend}-{node}'
     node: '{node}'
 
     wrappers:
@@ -39,7 +39,7 @@
 
 - job-template:
     name: 'gate-aodh-dsvm-tempest-plugin-{backend}{network}'
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     wrappers:
       - build-timeout:

jenkins/jobs/projects.yaml

@@ -153,19 +153,23 @@
       - openstack-publish-jobs
       - translation-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-aodh-dsvm-functional-{backend}':
+      - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
           node: ubuntu-trusty
           pipeline: gate
           backend: hbase
-      - '{pipeline}-aodh-dsvm-functional-{backend}':
-          node: ubuntu-trusty
+      - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           pipeline: gate
           backend: mysql
-      - '{pipeline}-aodh-dsvm-functional-{backend}':
-          node: ubuntu-trusty
+      - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           pipeline: gate
           backend: postgresql
-      - '{pipeline}-aodh-dsvm-functional-{backend}':
+      - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
           node: ubuntu-trusty
           pipeline: gate
           backend: mongodb

zuul/layout.yaml

@@ -2983,10 +2983,10 @@ jobs:
   - name: ^gate-tempest-dsvm-lvm-multibackend
     branch: ^(?!stable/(liberty|mitaka)).*$
 
-  - name: gate-aodh-dsvm-functional-hbase
+  - name: gate-aodh-dsvm-functional-hbase-ubuntu-trusty
     branch: ^stable/(mitaka|newton)
 
-  - name: gate-aodh-dsvm-functional-mongodb
+  - name: gate-aodh-dsvm-functional-mongodb-ubuntu-trusty
     branch: ^stable/(liberty|mitaka|newton)
 
   - name: gate-aodh-dsvm-tempest-plugin-hbase
@@ -5307,10 +5307,12 @@ projects:
       - name: publish-to-pypi
       - name: install-guide-jobs
     check:
-      - gate-aodh-dsvm-functional-hbase
-      - gate-aodh-dsvm-functional-mongodb
-      - gate-aodh-dsvm-functional-mysql
-      - gate-aodh-dsvm-functional-postgresql
+      - gate-aodh-dsvm-functional-hbase-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mongodb-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mysql-ubuntu-trusty
+      - gate-aodh-dsvm-functional-postgresql-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mysql-ubuntu-xenial
+      - gate-aodh-dsvm-functional-postgresql-ubuntu-xenial
       - gate-aodh-dsvm-tempest-plugin-hbase
       - gate-aodh-dsvm-tempest-plugin-mongodb
       - gate-aodh-dsvm-tempest-plugin-mysql
@@ -5319,10 +5321,12 @@ projects:
       - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty
       - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial
     gate:
-      - gate-aodh-dsvm-functional-hbase
-      - gate-aodh-dsvm-functional-mongodb
-      - gate-aodh-dsvm-functional-mysql
-      - gate-aodh-dsvm-functional-postgresql
+      - gate-aodh-dsvm-functional-hbase-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mongodb-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mysql-ubuntu-trusty
+      - gate-aodh-dsvm-functional-postgresql-ubuntu-trusty
+      - gate-aodh-dsvm-functional-mysql-ubuntu-xenial
+      - gate-aodh-dsvm-functional-postgresql-ubuntu-xenial
       - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty
       - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial