From b3602ac1916695c26b550f20f3aae3c2c526e02f Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 28 Mar 2019 15:00:29 -0400
Subject: [PATCH] Test using integrated build

In order to do a more complete verification of any patches,
we add a full uncontainerised OpenStack deployment to do the
functional testing using the integrated repo. This replaces
the previous functional test mechanism.

Any additional role tests are left as-is. They will require
some extra implementation in the integrated build before they
can be transferred.

The CentOS distro. installation was missing RPMs which meant
some binaries was missing, this patch adds those as well.

Depends-On: https://review.openstack.org/648502
Depends-On: https://review.openstack.org/648551
Depends-On: https://review.openstack.org/648575
Change-Id: I4b73967aacb92b63f9f01514979e31aa2fb5f61e
---
 vars/redhat-7.yml   |  4 ++++
 zuul.d/jobs.yaml    | 50 +++++++++++++++++++++++++++++++++++++++++++++
 zuul.d/project.yaml | 16 +++++++++++++--
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index cf942909..23ec9703 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -29,6 +29,10 @@ swift_devel_distro_packages:
 
 swift_service_distro_packages:
   - openstack-swift
+  - openstack-swift-account
+  - openstack-swift-container
+  - openstack-swift-object
+  - openstack-swift-proxy
   - python-keystonemiddleware
   - python-memcached
   - python-swift
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6266b984..8c4dd90f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,3 +19,53 @@
     vars:
       tox_env: swift3
 
+- job:
+    name: openstack-ansible-deploy-aio_metal_swift-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_swift-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+      install_method: distro
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_swift-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_swift-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+      install_method: distro
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_swift-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_swift-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_metal_swift
+      install_method: distro
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 672ed00b..277af7ed 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,12 +15,24 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
-      - openstack-ansible-role-distro_install-jobs
       - check-requirements
+      - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
+        - openstack-ansible-deploy-aio_metal_swift-centos-7
+        - openstack-ansible-deploy-aio_metal_swift-ubuntu-bionic
+        - openstack-ansible-deploy-aio_distro_metal_swift-centos-7
         - openstack-ansible-swift3-ubuntu-xenial:
             voting: false
+    gate:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_swift-centos-7
+        - openstack-ansible-deploy-aio_metal_swift-ubuntu-bionic
+        - openstack-ansible-deploy-aio_distro_metal_swift-centos-7
+    experimental:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_swift-opensuse-150
+        - openstack-ansible-deploy-aio_distro_metal_swift-opensuse-150
+        - openstack-ansible-deploy-aio_distro_metal_swift-ubuntu-bionic
\ No newline at end of file