run trusty on mitaka for aodh

mitaka devstack doesn't work with xenial -- it must run on trusty.
this patch runs functional and tempest gates on trusty for
mitaka and run them on xenial if otherwise

Change-Id: Ie89973df313532346134bd3af12f57a7438727fc

jenkins/jobs/aodh.yaml

@@ -38,8 +38,8 @@
       - console-log
 
 - job-template:
-    name: 'gate-aodh-dsvm-tempest-plugin-{backend}{network}'
-    node: ubuntu-xenial
+    name: 'gate-aodh-dsvm-tempest-plugin-{backend}{network}-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:

jenkins/jobs/projects.yaml

@@ -142,7 +142,9 @@
       - translation-jobs
       - openstack-releasenotes-jobs
       - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           pipeline: gate
           backend: hbase
       - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
@@ -158,19 +160,33 @@
           pipeline: gate
           backend: postgresql
       - '{pipeline}-aodh-dsvm-functional-{backend}-{node}':
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           pipeline: gate
           backend: mongodb
-      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}':
+      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           backend: hbase
           network: ''
-      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}':
+      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           backend: mongodb
           network: ''
-      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}':
+      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           backend: mysql
           network: ''
-      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}':
+      - 'gate-aodh-dsvm-tempest-plugin-{backend}{network}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           backend: postgresql
           network: ''
       - 'gate-telemetry-dsvm-integration-{name}-{node}':

zuul/layout.yaml

@@ -2860,17 +2860,17 @@ jobs:
   - name: ^gate-tempest-dsvm-full-lio-ubuntu-(trusty|xenial)
     voting: false
 
-  - name: gate-aodh-dsvm-functional-hbase-ubuntu-trusty
-    branch: ^stable/(mitaka|newton)
+  - name: ^gate-aodh-dsvm-functional-(hbase|mongodb)-ubuntu-trusty
+    branch: stable/mitaka
 
-  - name: gate-aodh-dsvm-functional-mongodb-ubuntu-trusty
-    branch: ^stable/(mitaka|newton)
+  - name: ^gate-aodh-dsvm-tempest-plugin-(hbase|mongodb)-ubuntu-trusty
+    branch: stable/mitaka
 
-  - name: gate-aodh-dsvm-tempest-plugin-hbase
-    branch: ^stable/(mitaka|newton)
+  - name: ^gate-aodh-dsvm-functional-(hbase|mongodb)-ubuntu-xenial
+    branch: stable/newton
 
-  - name: gate-aodh-dsvm-tempest-plugin-mongodb
-    branch: ^stable/(mitaka|newton)
+  - name: ^gate-aodh-dsvm-tempest-plugin-(hbase|mongodb)-ubuntu-xenial
+    branch: stable/newton
 
   # TODO(lcastell): Make voting once tests are fixed
   - name: ^gate-craton-dashboard-nodejs4-npm-run-test$
@@ -5216,12 +5216,18 @@ projects:
       - 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-hbase-ubuntu-xenial
+      - gate-aodh-dsvm-functional-mongodb-ubuntu-xenial
       - 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
-      - gate-aodh-dsvm-tempest-plugin-postgresql
+      - gate-aodh-dsvm-tempest-plugin-hbase-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-mongodb-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-mysql-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-postgresql-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-hbase-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-mongodb-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-mysql-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-postgresql-ubuntu-xenial
       - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty
       - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial
     gate:
@@ -5229,8 +5235,18 @@ projects:
       - 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-hbase-ubuntu-xenial
+      - gate-aodh-dsvm-functional-mongodb-ubuntu-xenial
       - gate-aodh-dsvm-functional-mysql-ubuntu-xenial
       - gate-aodh-dsvm-functional-postgresql-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-hbase-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-mongodb-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-mysql-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-postgresql-ubuntu-trusty
+      - gate-aodh-dsvm-tempest-plugin-hbase-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-mongodb-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-mysql-ubuntu-xenial
+      - gate-aodh-dsvm-tempest-plugin-postgresql-ubuntu-xenial
       - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty
       - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial