From d01d021e54869746f5d9343267d197e7ed24a99f Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sun, 4 Mar 2018 16:04:55 -0500
Subject: [PATCH] Add ozj for ubuntu-bionic

Start testing our jobs on ubuntu-bionic to ensure things work as
expected.

These will first be non-voting, until confirmed working.

Change-Id: I0e68f8e084650e030d0f9a38bc0329c120ea2086
Depends-On: https://review.openstack.org/536615
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 zuul.d/jobs.yaml    | 22 ++++++++++++++++++++++
 zuul.d/project.yaml |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6cc2d210..1f4465bb 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -48,6 +48,11 @@
     parent: openstack-infra-base-integration
     nodeset: opensuse-423
 
+- job:
+    name: openstack-infra-base-integration-ubuntu-bionic
+    parent: openstack-infra-base-integration
+    nodeset: ubuntu-bionic
+
 - job:
     name: openstack-infra-base-integration-ubuntu-trusty
     parent: openstack-infra-base-integration
@@ -157,6 +162,23 @@
           nodes:
             - secondary
 
+- job:
+    name: openstack-infra-multinode-integration-ubuntu-bionic
+    parent: openstack-infra-multinode-integration
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-bionic
+        - name: secondary
+          label: ubuntu-bionic
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
 - job:
     name: openstack-infra-multinode-integration-ubuntu-trusty
     parent: openstack-infra-multinode-integration
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index cb48f8bd..4e184d51 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,6 +6,8 @@
         - openstack-infra-base-integration-debian-jessie
         - openstack-infra-base-integration-fedora-26:
             voting: false
+        - openstack-infra-base-integration-ubuntu-bionic:
+            voting: false
         - openstack-infra-base-integration-ubuntu-trusty
         - openstack-infra-base-integration-ubuntu-xenial
         - openstack-infra-base-integration-opensuse423
@@ -13,6 +15,8 @@
         - openstack-infra-multinode-integration-debian-jessie
         - openstack-infra-multinode-integration-fedora-26:
             voting: false
+        - openstack-infra-multinode-integration-ubuntu-bionic:
+            voting: false
         - openstack-infra-multinode-integration-ubuntu-trusty
         - openstack-infra-multinode-integration-ubuntu-xenial
         - openstack-infra-multinode-integration-opensuse423