From e1aabd05b85cac3b931f01f547083ec8930eed16 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Sat, 6 Oct 2018 17:25:46 -0400
Subject: [PATCH] Disable nested virt and set SUSE+Bionic jobs to non-voting

The OpenSUSE jobs are always failing due to some RPM issues and
the Bionic job is always timing out.  Let's remove them for now
to be able to land code.

Also, it looks like OpenSUSE and CentOS are getting failures
when running with nested virt on other providers.  Let's just
get rid of it.

Change-Id: Ifae3425b66254aa655df5b6bb95896da1cccc32a
---
 .../tasks/prepare_aio_config.yml              |  8 +----
 zuul.d/project-templates.yaml                 | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index a2a69242a9..21f6147877 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -66,10 +66,6 @@
   when:
     - nodepool_dir.stat.exists
   block:
-    # OVH nodepool nodes have an issue which causes nested virt
-    # instances to crash with a hardware error, then a dump.
-    # We therefore detect whether we're running on OVH and
-    # force it to use qemu instead.
     - name: Discover the OpenStack-Infra mirrors
       shell: |
         source /etc/ci/mirror_info.sh
@@ -82,9 +78,7 @@
         echo "openstack_hosts_rdo_mirror_url: '${NODEPOOL_RDO_PROXY}'" >> ${NODEPOOL_OVERRIDES}
         echo "lxc_centos_package_baseurl: 'http://${NODEPOOL_MIRROR_HOST}:8080/copr-lxc2/epel-7-x86_64/'" >> ${NODEPOOL_OVERRIDES}
         echo "lxc_centos_package_key: 'http://${NODEPOOL_MIRROR_HOST}:8080/copr-lxc2/pubkey.gpg'" >> ${NODEPOOL_OVERRIDES}
-        if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then
-          echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
-        fi
+        echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
         echo "repo_build_pip_default_index: '${NODEPOOL_PYPI_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
       args:
         executable: /bin/bash
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 2100575abf..f9e2c0e6e9 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -44,17 +44,18 @@
       jobs:
         # - openstack-ansible-deploy-aio_lxc-centos-7
         # - openstack-ansible-deploy-aio_lxc-opensuse-423
-        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic:
+            voting: false
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
     gate:
       jobs:
         # - openstack-ansible-deploy-aio_lxc-centos-7
         # - openstack-ansible-deploy-aio_lxc-opensuse-423
-        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+        # - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
     periodic:
       jobs:
-        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+        # - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
         - openstack-ansible-upgrade-aio_lxc-ubuntu-xenial
 
@@ -67,12 +68,13 @@
     check:
       jobs:
         # - openstack-ansible-deploy-aio_distro_lxc-centos-7
-        - openstack-ansible-deploy-aio_distro_lxc-opensuse-423
+        - openstack-ansible-deploy-aio_distro_lxc-opensuse-423:
+            voting: false
         # - openstack-ansible-deploy-aio_distro_lxc-ubuntu-xenial
     gate:
-      jobs:
+      jobs: []
         # - openstack-ansible-deploy-aio_distro_lxc-centos-7
-        - openstack-ansible-deploy-aio_distro_lxc-opensuse-423
+        # - openstack-ansible-deploy-aio_distro_lxc-opensuse-423
         # - openstack-ansible-deploy-aio_distro_lxc-ubuntu-xenial
 
 - project-template:
@@ -94,12 +96,13 @@
     check:
       jobs:
         - openstack-ansible-deploy-aio_basekit-centos-7
-        - openstack-ansible-deploy-aio_basekit-opensuse-423
+        - openstack-ansible-deploy-aio_basekit-opensuse-423:
+             voting: false
         # - openstack-ansible-deploy-aio_basekit-ubuntu-xenial
     gate:
       jobs:
         - openstack-ansible-deploy-aio_basekit-centos-7
-        - openstack-ansible-deploy-aio_basekit-opensuse-423
+        # - openstack-ansible-deploy-aio_basekit-opensuse-423
         # - openstack-ansible-deploy-aio_basekit-ubuntu-xenial
 
 # NOTE(mnaser): Distro basekit jobs disabled for other distros until stable
@@ -108,12 +111,13 @@
     check:
       jobs:
         # - openstack-ansible-deploy-aio_distro_basekit-centos-7
-        - openstack-ansible-deploy-aio_distro_basekit-opensuse-423
+        - openstack-ansible-deploy-aio_distro_basekit-opensuse-423:
+            voting: false
         # - openstack-ansible-deploy-aio_distro_basekit-ubuntu-xenial
     gate:
-      jobs:
+      jobs: []
         # - openstack-ansible-deploy-aio_distro_basekit-centos-7
-        - openstack-ansible-deploy-aio_distro_basekit-opensuse-423
+        # - openstack-ansible-deploy-aio_distro_basekit-opensuse-423
         # - openstack-ansible-deploy-aio_distro_basekit-ubuntu-xenial
 
 - project-template:
@@ -153,10 +157,11 @@
     check:
       jobs:
         #- openstack-ansible-deploy-distro_ceph-centos-7
-        - openstack-ansible-deploy-distro_ceph-opensuse-423
+        - openstack-ansible-deploy-distro_ceph-opensuse-423:
+            voting: false
         #- openstack-ansible-deploy-distro_ceph-ubuntu-xenial
     gate:
-      jobs:
+      jobs: []
         #- openstack-ansible-deploy-distro_ceph-centos-7
-        - openstack-ansible-deploy-distro_ceph-opensuse-423
+        # - openstack-ansible-deploy-distro_ceph-opensuse-423
         #- openstack-ansible-deploy-distro_ceph-ubuntu-xenial