From 7cd0b561a5701a880510eb26f11195644c5e64db Mon Sep 17 00:00:00 2001
From: "Donovan Francesco (drifterza)" <donovan.francesco@gmail.com>
Date: Thu, 17 Nov 2016 10:52:24 +0200
Subject: [PATCH] Using updated tempest method for designate api.

Change-Id: I94147366a6b7866d6de1920f72c7791eea3a243d
---
 .gitignore                          |  7 ++-----
 tests/os_designate-overrides.yml    | 10 +++++-----
 tests/test-designate-functional.yml | 26 --------------------------
 tests/test-install-tempest.yml      | 23 -----------------------
 tests/test.yml                      |  7 ++-----
 5 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 tests/test-designate-functional.yml
 delete mode 100644 tests/test-install-tempest.yml

diff --git a/.gitignore b/.gitignore
index 21adf3c..b57b99d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,11 +61,8 @@ ChangeLog
 releasenotes/build
 
 # Test temp files
-tests/plugins
-tests/playbooks
-tests/test.retry
+tests/common
+tests/*.retry
 
 # Vagrant artifacts
 .vagrant
-
-
diff --git a/tests/os_designate-overrides.yml b/tests/os_designate-overrides.yml
index 83897cd..f04e394 100644
--- a/tests/os_designate-overrides.yml
+++ b/tests/os_designate-overrides.yml
@@ -35,12 +35,12 @@ designate_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
 designate_rabbitmq_port: "{{ rabbitmq_port }}"
 designate_bin: "/openstack/venvs/designate-{{ designate_venv_tag }}/bin"
 
-tempest_venv_tag: "{{ tempest_git_install_branch }}"
-# tempest_venv_bin is the same as the default in os_tempest role, but we set
-# it again here so we can refer to it in test-designate-functional.yml
-tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
-tempest_log_dir: "/var/log/"
+tempest_run: yes
+
 tempest_plugins:
   - name: designate-tempest-plugin
     repo: https://git.openstack.org/openstack/designate-tempest-plugin
     branch: master
+
+tempest_test_whitelist:
+  - designate_tempest_plugin.tests.scenario.v2.test_zones
diff --git a/tests/test-designate-functional.yml b/tests/test-designate-functional.yml
deleted file mode 100644
index 30888b3..0000000
--- a/tests/test-designate-functional.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Copyright 2015, Rackspace US, Inc.
-#
-# 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.
-
-- name: Playbook for tempest testing of designate
-  hosts: utility_all
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Run tempest
-      shell: |
-        . {{ tempest_venv_bin }}/activate
-        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env --serial designate_tempest_plugin.tests.scenario.v2.test_zones
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test-install-tempest.yml b/tests/test-install-tempest.yml
deleted file mode 100644
index 7b6ed39..0000000
--- a/tests/test-install-tempest.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Copyright 2015, Rackspace US, Inc.
-#
-# 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.
-
-- name: Playbook for deploying tempest
-  hosts: designate_all
-  user: root
-  gather_facts: true
-  roles:
-    - role: "os_tempest"
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index 371d732..36147ae 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -28,8 +28,5 @@
 # Install Designate
 - include: test-install-designate.yml
 
-# Install Tempest
-- include: test-install-tempest.yml
-
-# Test Designate
-- include: test-designate-functional.yml
+# Install and execute Tempest
+- include: common/test-install-tempest.yml