From 62aa6923e682c408ff9b16998c4d5e0c4c2a7d52 Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Mon, 27 May 2019 12:32:46 -0500
Subject: [PATCH] Adapt tempestconf job to use integrated repo

Adapt the tempestconf job to use a variant of the integrated repo's
AIO test job.

Change-Id: Ib05c78339c25da8b3510f363e710992fd95bbeee
---
 tox.ini                              |  8 --------
 zuul.d/jobs.yaml                     |  9 ++++-----
 zuul.d/playbooks/pre-tempestconf.yml | 24 ++++++++++++++++++++++++
 zuul.d/project.yaml                  |  4 ++--
 4 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 zuul.d/playbooks/pre-tempestconf.yml

diff --git a/tox.ini b/tox.ini
index ca8d04f4..4b969cff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -90,14 +90,6 @@ basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
-[testenv:tempestconf]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-e tempest_use_tempestconf=true
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
 [testenv:functional]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 36e661f2..88a0abe8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 - job:
-    name: openstack-ansible-functional-tempestconf-centos-7
-    parent: openstack-ansible-functional
-    nodeset: centos-7
-    vars:
-      tox_env: tempestconf
+    name: openstack-ansible-deploy-aio_distro_metal_tempestconf-centos-7
+    parent: openstack-ansible-deploy-aio_distro_metal-centos-7
+    pre-run:
+      - zuul.d/playbooks/pre-tempestconf.yml
diff --git a/zuul.d/playbooks/pre-tempestconf.yml b/zuul.d/playbooks/pre-tempestconf.yml
new file mode 100644
index 00000000..524e40aa
--- /dev/null
+++ b/zuul.d/playbooks/pre-tempestconf.yml
@@ -0,0 +1,24 @@
+---
+# Copyright 2019, Logan Vig <logan2211@gmail.com>
+#
+# 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.
+
+- hosts: all[0]
+  become: yes
+  tasks:
+    - name: Configure the tempestconf settings
+      copy:
+        content: |
+          ---
+          tempest_use_tempestconf: true
+        dest: /etc/openstack_deploy/user_variables_tempest.yml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7649b7ff..96f54eb9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,9 +23,9 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-functional-tempestconf-centos-7
+        - openstack-ansible-deploy-aio_distro_metal_tempestconf-centos-7
         - tripleo-ci-centos-7-standalone-os-tempest
     gate:
       jobs:
-        - openstack-ansible-functional-tempestconf-centos-7
+        - openstack-ansible-deploy-aio_distro_metal_tempestconf-centos-7
         - tripleo-ci-centos-7-standalone-os-tempest