@@ -88,6 +88,66 @@

         nodes:

           - compute1

+- nodeset:

+    name: openstack-two-node-bionic

+    nodes:

+      - name: controller

+        label: ubuntu-bionic

+      - name: compute1

+        label: ubuntu-bionic

+    groups:

+      # Node where tests are executed and test results collected

+      - name: tempest

+        nodes:

+          - controller

+      # Nodes running the compute service

+      - name: compute

+        nodes:

+          - controller

+          - compute1

+      # Nodes that are not the controller

+      - name: subnode

+        nodes:

+          - compute1

+      # Switch node for multinode networking setup

+      - name: switch

+        nodes:

+          - controller

+      # Peer nodes for multinode networking setup

+      - name: peers

+        nodes:

+          - compute1

+

+- nodeset:

+    name: openstack-two-node-xenial

+    nodes:

+      - name: controller

+        label: ubuntu-xenial

+      - name: compute1

+        label: ubuntu-xenial

+    groups:

+      # Node where tests are executed and test results collected

+      - name: tempest

+        nodes:

+          - controller

+      # Nodes running the compute service

+      - name: compute

+        nodes:

+          - controller

+          - compute1

+      # Nodes that are not the controller

+      - name: subnode

+        nodes:

+          - compute1

+      # Switch node for multinode networking setup

+      - name: switch

+        nodes:

+          - controller

+      # Peer nodes for multinode networking setup

+      - name: peers

+        nodes:

+          - compute1

+

 - job:

     name: devstack-base

     parent: multinode

@@ -209,7 +269,7 @@

     description: |

       Minimal devstack base job, intended for use by jobs that need

       less than the normal minimum set of required-projects.

-    nodeset: openstack-single-node

+    nodeset: openstack-single-node-bionic

     required-projects:

       - git.openstack.org/openstack/requirements

     vars:

@@ -268,7 +328,6 @@

       The run playbook consists of a single role, so it can be easily rewritten

       and extended.

-    nodeset: openstack-single-node

     required-projects:

       - git.openstack.org/openstack/cinder

       - git.openstack.org/openstack/glance

@@ -400,13 +459,30 @@

         USE_PYTHON3: true

 - job:

+    name: devstack-xenial

+    parent: devstack

+    nodeset: openstack-single-node-xenial

+    description: |

+      Simple singlenode test to verify functionality on devstack

+      side running on Xenial.

+

+- job:

     name: devstack-multinode

     parent: devstack

-    nodeset: openstack-two-node

+    nodeset: openstack-two-node-bionic

     description: |

       Simple multinode test to verify multinode functionality on devstack side.

       This is not meant to be used as a parent job.

+- job:

+    name: devstack-multinode-xenial

+    parent: devstack

+    nodeset: openstack-two-node-xenial

+    description: |

+      Simple multinode test to verify multinode functionality on devstack

+      side running on Xenial.

+      This is not meant to be used as a parent job.

+

 # NOTE(ianw) Platform tests have traditionally been non-voting because

 # we often have to rush things through devstack to stabilise the gate,

 # and these platforms don't have the round-the-clock support to avoid

@@ -433,6 +509,13 @@

     voting: false

 - job:

+    name: devstack-platform-xenial

+    parent: tempest-full

+    description: Ubuntu Xenial platform test

+    nodeset: openstack-single-node-xenial

+    voting: false

+

+- job:

     name: devstack-tox-base

     parent: devstack

     description: |

@@ -503,12 +586,15 @@

     check:

       jobs:

         - devstack

+        - devstack-xenial

         - devstack-ipv6:

             voting: false

         - devstack-platform-centos-7

         - devstack-platform-opensuse-150

         - devstack-platform-fedora-latest

+        - devstack-platform-xenial

         - devstack-multinode

+        - devstack-multinode-xenial

         - devstack-unit-tests

         - openstack-tox-bashate

         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa:

@@ -538,6 +624,9 @@

     gate:

       jobs:

         - devstack

+        - devstack-xenial

+        - devstack-multinode

+        - devstack-multinode-xenial

         - devstack-unit-tests

         - openstack-tox-bashate

         - neutron-grenade-multinode: