From 6780da1b084e083a7b700b138f38fd1c99f4862b Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 28 Mar 2019 23:56: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.

There are some developer mode references that are causing the
role to not run properly due to an undefined variable.

Depends-On: https://review.openstack.org/647840
Depends-On: https://review.openstack.org/648502
Depends-On: https://review.openstack.org/648551
Depends-On: https://review.openstack.org/648741
Change-Id: I943bab8177e556dc8ef6d1bece287c19808a7d58
---
 zuul.d/jobs.yaml    | 37 +++++++++++++++++++++++++++++++++++++
 zuul.d/project.yaml | 13 ++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 zuul.d/jobs.yaml

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
new file mode 100644
index 0000000..15d2b78
--- /dev/null
+++ b/zuul.d/jobs.yaml
@@ -0,0 +1,37 @@
+---
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_rally-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_metal_rally
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_rally-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal_rally
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_rally-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_metal_rally
\ No newline at end of file
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e4b8357..70cd582 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,7 +14,18 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
+      - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_rally-centos-7
+        - openstack-ansible-deploy-aio_metal_rally-ubuntu-bionic
+    gate:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_rally-centos-7
+        - openstack-ansible-deploy-aio_metal_rally-ubuntu-bionic
+    experimental:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_rally-opensuse-150
\ No newline at end of file