Merge "Use aio_basekit scenario for OpenSUSE"

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

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