From cce89975cd291da2581b0ad3a657ac1b55ec3a86 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 28 Mar 2019 22:28:14 -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/649397
Depends-On: https://review.openstack.org/649442
Change-Id: Ib021b074d4675ca5a3164cfd5f0196d347740639
---
 tasks/trove_service_network.yml |  6 ------
 tests/os_trove-overrides.yml    |  2 +-
 zuul.d/jobs.yaml                | 38 +++++++++++++++++++++++++++++++++
 zuul.d/project.yaml             | 13 ++++++++++-
 4 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 zuul.d/jobs.yaml

diff --git a/tasks/trove_service_network.yml b/tasks/trove_service_network.yml
index e1efc5f..1baaceb 100644
--- a/tasks/trove_service_network.yml
+++ b/tasks/trove_service_network.yml
@@ -62,10 +62,6 @@
   # Block end
   when: trove_service_net_setup
 
-# At this point we need to get the neutron network for trove to use. In our role testing
-# environment this won't succeed. So we'll bypass it when in developer mode otherwise,
-# this task will fail if trove_service_net_setup is false or else if the
-# network isn't pre-created by the user.
 - name: Get trove service net id
   os_networks_facts:
     cloud: default
@@ -73,7 +69,6 @@
     wait: yes
     name: "{{ trove_service_net_name }}"
   run_once: true
-  when: not trove_developer_mode | bool
 
 - name: Fail if trove service network is not available
   fail:
@@ -83,7 +78,6 @@
       "to the deployed VMs. This network can be created prior to running this"
       " playbook or can be setup by setting trove_service_net_setup to true."
   when:
-    - not trove_developer_mode | bool
     - openstack_networks is not defined or openstack_networks | length == 0
 
 - name: Save trove service net id
diff --git a/tests/os_trove-overrides.yml b/tests/os_trove-overrides.yml
index 729e128..a153302 100644
--- a/tests/os_trove-overrides.yml
+++ b/tests/os_trove-overrides.yml
@@ -16,7 +16,7 @@
 # (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 
-trove_developer_mode: True
+trove_service_net_setup: true
 trove_galera_password: "secrete"
 trove_oslomsg_rpc_password: "secrete"
 trove_guest_auth_url: "{{ trove_auth_url }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
new file mode 100644
index 0000000..d43761c
--- /dev/null
+++ b/zuul.d/jobs.yaml
@@ -0,0 +1,38 @@
+---
+#
+# 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_trove-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_metal_trove
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_trove-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal_trove
+
+- job:
+    name: openstack-ansible-deploy-aio_metal_trove-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_metal_trove
+
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e4b8357..8b37b2d 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_trove-centos-7
+        - openstack-ansible-deploy-aio_metal_trove-ubuntu-bionic
+    gate:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_trove-centos-7
+        - openstack-ansible-deploy-aio_metal_trove-ubuntu-bionic
+    experimental:
+      jobs:
+        - openstack-ansible-deploy-aio_metal_trove-opensuse-150
\ No newline at end of file