Add experimental tests for Monasca on xenial

This change aims to test the change, which adds support for ubuntu-xenial to
Monasca devstack plugin:
I351ce88ca8b26e1bdcc6eb61fd41960ad8774ffb

The test for xenial should run as experimental only on master branch.

All existing tests for trusty should run on all branches.

Change-Id: I55135ba59bc0cd426c36e19da7d44b122e67b619

jenkins/jobs/monasca.yaml

@@ -1,7 +1,6 @@
 - job-template:
-    name: 'gate-tempest-dsvm-monasca-python-full{job-suffix}'
-
-    node: ubuntu-trusty
+    name: 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -48,8 +47,8 @@
       - console-log
 
 - job-template:
-    name: 'gate-tempest-dsvm-monasca-java-full{job-suffix}'
-    node: ubuntu-trusty
+    name: 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -101,13 +100,23 @@
 - job-group:
     name: 'tempest-monasca-full-jobs'
     jobs:
-      - 'gate-tempest-dsvm-monasca-python-full{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
+          node:
+            - 'ubuntu-trusty'
           job-suffix: ''
-      - 'gate-tempest-dsvm-monasca-python-full{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
+          node:
+            - 'ubuntu-trusty'
+            - 'ubuntu-xenial'
           job-suffix: '-nv'
-      - 'gate-tempest-dsvm-monasca-java-full{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
+          node:
+            - 'ubuntu-trusty'
           job-suffix: ''
-      - 'gate-tempest-dsvm-monasca-java-full{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
+          node:
+            - 'ubuntu-trusty'
+            - 'ubuntu-xenial'
           job-suffix: '-nv'
 
 - job-template:

zuul/layout.yaml

@@ -3452,6 +3452,14 @@ jobs:
     branch: master
     voting: false
 
+  # Run Monasca tempest tests for trusty on all branches. New tests for xenial
+  # only on master.
+  - name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-trusty.*$
+    branch: ^(stable/(mitaka|newton)|master)$
+
+  - name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-xenial.*$
+    branch: master
+
   # Make sure we do not match openstack-ansible jobs, as they have their own
   # rules.
   - name: ^gate-(?!openstack-ansible).*(-dsvm)?-ansible-func-ubuntu-trusty(-nv)?$
@@ -11212,8 +11220,8 @@ projects:
       - gate-monasca-agent-python27-ubuntu-trusty
       - gate-monasca-agent-pep8-ubuntu-xenial
       - gate-monasca-agent-python27-ubuntu-xenial
-      - gate-tempest-dsvm-monasca-python-full-nv
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-agent-pep8-ubuntu-trusty
       - gate-monasca-agent-python27-ubuntu-trusty
@@ -11245,18 +11253,21 @@ projects:
       - gate-monasca-api-pep8-ubuntu-xenial
       - gate-monasca-api-python27-ubuntu-xenial
       - gate-monasca-api-build
-      - gate-tempest-dsvm-monasca-python-full
-      - gate-tempest-dsvm-monasca-java-full
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
     gate:
       - gate-monasca-api-pep8-ubuntu-trusty
       - gate-monasca-api-python27-ubuntu-trusty
       - gate-monasca-api-pep8-ubuntu-xenial
       - gate-monasca-api-python27-ubuntu-xenial
       - gate-monasca-api-build
-      - gate-tempest-dsvm-monasca-python-full
-      - gate-tempest-dsvm-monasca-java-full
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
     post:
       - monasca-api-localrepo-upload
+    experimental:
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
 
   - name: openstack/monasca-ceilometer
     template:
@@ -11283,8 +11294,8 @@ projects:
       - gate-monasca-common-pep8-ubuntu-xenial
       - gate-monasca-common-python27-ubuntu-xenial
       - gate-monasca-common-build
-      - gate-tempest-dsvm-monasca-python-full-nv
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-common-pep8-ubuntu-trusty
       - gate-monasca-common-python27-ubuntu-trusty
@@ -11343,8 +11354,8 @@ projects:
       - gate-monasca-notification-python27-ubuntu-trusty
       - gate-monasca-notification-pep8-ubuntu-xenial
       - gate-monasca-notification-python27-ubuntu-xenial
-      - gate-tempest-dsvm-monasca-python-full-nv
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-notification-pep8-ubuntu-trusty
       - gate-monasca-notification-python27-ubuntu-trusty
@@ -11362,15 +11373,15 @@ projects:
       - gate-monasca-persister-pep8-ubuntu-xenial
       - gate-monasca-persister-python27-ubuntu-xenial
       - gate-monasca-persister-build
-      - gate-tempest-dsvm-monasca-python-full
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-persister-pep8-ubuntu-trusty
       - gate-monasca-persister-python27-ubuntu-trusty
       - gate-monasca-persister-pep8-ubuntu-xenial
       - gate-monasca-persister-python27-ubuntu-xenial
       - gate-monasca-persister-build
-      - gate-tempest-dsvm-monasca-python-full
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
     post:
       - monasca-persister-localrepo-upload
 
@@ -11384,8 +11395,8 @@ projects:
       - gate-monasca-statsd-python27-ubuntu-trusty
       - gate-monasca-statsd-pep8-ubuntu-xenial
       - gate-monasca-statsd-python27-ubuntu-xenial
-      - gate-tempest-dsvm-monasca-python-full-nv
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-statsd-pep8-ubuntu-trusty
       - gate-monasca-statsd-python27-ubuntu-trusty
@@ -11397,8 +11408,8 @@ projects:
       - name: merge-check
     check:
       - gate-monasca-thresh-build
-      - gate-tempest-dsvm-monasca-python-full-nv
-      - gate-tempest-dsvm-monasca-java-full-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
     gate:
       - gate-monasca-thresh-build
     post: