From 573bd04e44859242149aed19b53548b3c665ae1a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Tue, 8 May 2018 22:37:38 +0200
Subject: [PATCH] Add Bionic testing

Now that bionic testing is added into the tests repos, we can
start testing it in the repo.

Depends-On: https://review.openstack.org/#/c/566959/
Change-Id: I732766c759d72783ff4680733de7ab9f50125e81
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 meta/main.yml         |  1 +
 vars/ubuntu-18.04.yml | 35 +++++++++++++++++++++++++++++++++++
 zuul.d/jobs.yaml      |  5 +++++
 zuul.d/project.yaml   |  6 ++++--
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 vars/ubuntu-18.04.yml

diff --git a/meta/main.yml b/meta/main.yml
index 00f4da5..be252b7 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - bionic
         - xenial
     - name: EL
       versions:
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
new file mode 100644
index 0000000..52d651d
--- /dev/null
+++ b/vars/ubuntu-18.04.yml
@@ -0,0 +1,35 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+_nspawn_map:
+  distro: ubuntu
+  arch: "{{ nspawn_architecture_mapping[container_architecture] }}"
+  release: bionic
+
+# This is a list of items that will be passed into the container as READ-ONLY
+# files or directories. If any of these items are passed into the container
+# the container create process will ensure the file is not present within the
+# contianer prior to writting the config.
+_nspawn_read_only_host_bindmount:
+  - { source: /etc/environment, dest: /etc/environment }
+
+# This is a list of items that will be passed into the container as a shared
+# bind mount. If any of these items are passed into the container.
+_nspawn_shared_host_bindmount:
+  - /etc/localtime
+  - /root
+  - /opt
+
+_nspawn_container_enable_resolved: true
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 14435d4..7f98ded 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- job:
+    name: openstack-ansible-nspawn-ubuntu-bionic
+    parent: openstack-ansible-functional
+    nodeset: ubuntu-xenial
+
 - job:
     name: openstack-ansible-nspawn-ubuntu-xenial
     parent: openstack-ansible-functional
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4eed9ff..f5e693a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,15 +16,17 @@
     check:
       jobs:
         - openstack-ansible-linters
-        - openstack-ansible-nspawn-ubuntu-xenial
         - openstack-ansible-nspawn-centos-7
         - openstack-ansible-nspawn-opensuse-423
+        - openstack-ansible-nspawn-ubuntu-bionic
+        - openstack-ansible-nspawn-ubuntu-xenial
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio
     gate:
       jobs:
         - openstack-ansible-linters
-        - openstack-ansible-nspawn-ubuntu-xenial
         - openstack-ansible-nspawn-centos-7
         - openstack-ansible-nspawn-opensuse-423
+        - openstack-ansible-nspawn-ubuntu-bionic
+        - openstack-ansible-nspawn-ubuntu-xenial