From cedab48a3a758175e00890e9d0ad0fb14f722261 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Tue, 31 Jul 2018 15:09:36 +0200
Subject: [PATCH] Gate on CentOS 7 and check on Ubuntu Bionic

There is an increasing demand for CentOS 7 based deployments. We should
gate on it for both controller and amphora to make sure we don't
overlook possible hidden issues.

Ubuntu Bionic has not been extensively tested yet, so we make it
a non-voting check job for now.

Depends-On: https://review.openstack.org/#/c/595336/

Change-Id: Iafd31337fed62affc4125e0e1eea0179db5f776d
---
 zuul.d/jobs.yaml     | 19 ++++++++++++++++++-
 zuul.d/projects.yaml |  4 ++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c56bee8c..e6e27014 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -15,7 +15,7 @@
       - ^releasenotes/.*$
     vars:
       devstack_localrc:
-        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/octavia-tempest-plugin'"
+        TEMPEST_PLUGINS: "'/opt/stack/octavia-tempest-plugin'"
       devstack_local_conf:
         post-config:
           $OCTAVIA_CONF:
@@ -124,3 +124,20 @@
     vars:
       devstack_localrc:
         USE_PYTHON3: true
+- job:
+    name: octavia-v2-dsvm-scenario-centos.7
+    parent: octavia-v2-dsvm-scenario
+    nodeset: devstack-single-node-centos-7
+    vars:
+      devstack_localrc:
+        OCTAVIA_AMP_BASE_OS: centos
+        OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
+        OCTAVIA_AMP_IMAGE_SIZE: 3
+
+- job:
+    name: octavia-v2-dsvm-scenario-ubuntu.bionic
+    parent: octavia-v2-dsvm-scenario
+    vars:
+      devstack_localrc:
+        OCTAVIA_AMP_BASE_OS: ubuntu
+        OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: bionic
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f09a634e..2a4ddd7f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -7,6 +7,9 @@
         - octavia-v2-dsvm-noop-py35-api
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-scenario-centos.7
+        - octavia-v2-dsvm-scenario-ubuntu.bionic:
+            voting: false
     gate:
       queue: octavia
       jobs:
@@ -14,3 +17,4 @@
         - octavia-v2-dsvm-noop-py35-api
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-scenario-centos.7