From 9f36b2d171a8c3a38f151cdc1b59772a833264f8 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Tue, 27 Feb 2018 09:40:38 -0600
Subject: [PATCH] Use aio_basekit scenario for OpenSUSE

The aio_basekit scenario is helping the CentOS tests complete
more often and this could help the OpenSUSE tests as well.
This patch adds a non-voting gate test for OpenSUSE using the
aio_basekit scenario. It also disables the existing OpenSUSE
tests since they time out frequently.

Depends-On: Ie1bde8981e46361b611bee0d0be9ff6e5919821b
Change-Id: Ib4a80f7c67518029adf7c6c7bca7d4a95f3f43c9
---
 zuul.d/jobs.yaml    |  7 +++++++
 zuul.d/project.yaml | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6c69f3adea..db473bdb94 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -162,6 +162,13 @@
     nodeset: opensuse-423
     voting: false
 
+- job:
+    name: openstack-ansible-deploy-aio_basekit-opensuse-423
+    parent: openstack-ansible-deploy-aio_lxc-opensuse-423
+    vars:
+      action: deploy
+      scenario: aio_basekit
+
 - job:
     name: openstack-ansible-deploy-ceph-opensuse-423
     parent: openstack-ansible-deploy-aio_lxc-opensuse-423
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 414ffd9738..73612d149c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,17 +17,17 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-varstest-aio_lxc-ubuntu-xenial
-        # NOTE(mhayden): Temporarily replacing with aio_basekit scenario.
-        # - openstack-ansible-deploy-aio_lxc-centos-7
-        - openstack-ansible-deploy-aio_lxc-opensuse-423
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
-        # NOTE(mhayden): Temporarily replacing with aio_basekit scenario.
-        # - openstack-ansible-deploy-ceph-centos-7
         - openstack-ansible-deploy-ceph-ubuntu-xenial
-        - openstack-ansible-deploy-ceph-opensuse-423
         - openstack-ansible-deploy-aio_metal-ubuntu-xenial
         - openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
+        # NOTE(mhayden): Temporarily replacing with aio_basekit scenario.
+        # - openstack-ansible-deploy-aio_lxc-centos-7
+        # - openstack-ansible-deploy-aio_lxc-opensuse-423
+        # - openstack-ansible-deploy-ceph-centos-7
+        # - openstack-ansible-deploy-ceph-opensuse-423
         - openstack-ansible-deploy-aio_basekit-centos-7
+        - openstack-ansible-deploy-aio_basekit-opensuse-423
     experimental:
       jobs:
         - openstack-ansible-deploy-octavia-ubuntu-xenial