Use centralised Ansible test scripts

This patch consumes the centralised Ansible test scripts
implemented in https://review.openstack.org/381853

Depends-On: I5c1f2f0949d6b7ad7bfc4151257b081728ba956f
Change-Id: I89f0f94c12cf1a152e81eb6507216f8c3ae8db36

tests/inventory

@@ -1 +1,2 @@
-localhost ansible_connection=local ansible_become=True
+[all]
+localhost ansible_connection=local ansible_become=True

tests/openstack_openrc-overrides.yml

@@ -0,0 +1,19 @@
+---
+# Copyright 2016, 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.
+
+keystone_service_adminuri_insecure: False
+keystone_service_internaluri_insecure: False
+openrc_os_password: secrete
+openrc_os_domain_name: Default

tests/test.yml

@@ -15,11 +15,6 @@
 
 - name: Playbook for role testing
   hosts: localhost
-  vars:
-    keystone_service_adminuri_insecure: False
-    keystone_service_internaluri_insecure: False
-    openrc_os_password: secrete
-    openrc_os_domain_name: Default
   roles:
     - role: "openstack_openrc"
   post_tasks:

tox.ini

@@ -25,6 +25,7 @@ whitelist_externals =
 setenv =
     PYTHONUNBUFFERED=1
     ROLE_NAME=openstack_openrc
+    TEST_IDEMPOTENCE=true
     VIRTUAL_ENV={envdir}
     WORKING_DIR={toxinidir}
 
@@ -83,28 +84,22 @@ commands =
 deps =
     {[testenv]deps}
     -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
-commands =
-    {[testenv:tests_clone]commands}
-    bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
 
 
 [testenv:ansible-syntax]
 deps =
     {[testenv:ansible]deps}
 commands =
-    {[testenv:ansible]commands}
-    ansible-playbook -i {toxinidir}/tests/inventory \
-                     --syntax-check \
-                     --list-tasks \
-                     {toxinidir}/tests/test.yml
+    {[testenv:tests_clone]commands}
+    bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
 
 
 [testenv:ansible-lint]
 deps =
     {[testenv:ansible]deps}
 commands =
-    {[testenv:ansible]commands}
-    ansible-lint {toxinidir}
+    {[testenv:tests_clone]commands}
+    bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
 
 [testenv:func_base]
@@ -115,17 +110,7 @@ install_command =
     pip install -U --force-reinstall {opts} {packages}
 
 
-[testenv:func_logs]
-commands =
-    bash -c "{toxinidir}/tests/common/test-log-collect.sh"
-
-
 [testenv:functional]
-# Ignore_errors is set to true so that the logs are collected at the
-#  end of the run. This will not produce a false positive. Any
-#  exception will be mark the run as failed and exit 1 after all of
-#  the commands have been iterated through.
-ignore_errors = True
 # NOTE(odyssey4me): this target does not use constraints because
 # it doesn't work in OpenStack-CI yet. Once that's fixed, we can
 # drop the install_command.
@@ -134,16 +119,8 @@ install_command =
 deps =
     {[testenv:ansible]deps}
 commands =
-    {[testenv:ansible]commands}
-    ansible-playbook -i {toxinidir}/tests/inventory \
-                     {toxinidir}/tests/test.yml -vvvv
-    # Idempotency test
-    bash -c 'ansible-playbook -i {toxinidir}/tests/inventory \
-                     {toxinidir}/tests/test.yml \
-                     | grep -q "changed=0.*failed=0" \
-                     && (echo "Idempotence test: pass" && exit 0) \
-                     || (echo "Idempotence test: fail" && exit 1)'
-    {[testenv:func_logs]commands}
+    {[testenv:tests_clone]commands}
+    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
 [testenv:linters]