Using updated tempest method for ceilometer.

Change-Id: I371e1569c7cc717ce00f2cf939afb004450b1823

tests/os_ceilometer-gnocchi-overrides.yml

@@ -59,26 +59,14 @@ swift_system_shell: /bin/false
 swift_system_comment: swift test user
 swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
 
-tempest_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
-tempest_pip_packages:
-  - tempest
-  - junitxml
-  - nose
-  - pyOpenSSL # added from the os_tempest role defaults to support tempest plugin deps
-  - python-ceilometerclient
-  - python-cinderclient
-  - python-glanceclient
-  - python-heatclient
-  - python-keystoneclient
-  - python-memcached
-  - python-neutronclient
-  - python-novaclient
-  - python-openstackclient
-  - python-saharaclient
-  - python-subunit
-  - python-swiftclient
+tempest_run: yes
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 
 tempest_plugins:
   - name: tempest-ceilometer
     repo: https://git.openstack.org/openstack/ceilometer
     branch: master
+
+tempest_test_whitelist:
+  - ceilometer.tests.tempest.api.test_telemetry_notification_api

tests/os_ceilometer-overrides.yml

@@ -47,27 +47,14 @@ swift_system_shell: /bin/false
 swift_system_comment: swift test user
 swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
 
-
-tempest_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
-tempest_pip_packages:
-  - tempest
-  - junitxml
-  - nose
-  - pyOpenSSL # added from the os_tempest role defaults to support tempest plugin deps
-  - python-ceilometerclient
-  - python-cinderclient
-  - python-glanceclient
-  - python-heatclient
-  - python-keystoneclient
-  - python-memcached
-  - python-neutronclient
-  - python-novaclient
-  - python-openstackclient
-  - python-saharaclient
-  - python-subunit
-  - python-swiftclient
+tempest_run: yes
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 
 tempest_plugins:
   - name: tempest-ceilometer
     repo: https://git.openstack.org/openstack/ceilometer
     branch: master
+
+tempest_test_whitelist:
+  - ceilometer.tests.tempest.api.test_telemetry_notification_api

tests/test-functional-ceilometer.yml

@@ -1,49 +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 functional testing ceilometer
-  hosts: ceilometer_api
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Install httplib2 so we can use the uri module
-      pip:
-        name: httplib2
-    - name: Check the ceilometer-api
-      uri:
-        url: "http://localhost:8777"
-        status_code: 401
-      register: result
-      until:
-        - result is defined
-        - result.status is defined
-        - result.status == 401
-      retries: 5
-      delay: 10
-  vars_files:
-    - common/test-vars.yml
-
-- name: Playbook for tempest testing ceilometer
-  hosts: utility_all
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Run tempest
-      shell: |
-        . {{ tempest_bin }}/activate
-        {{ tempest_bin | dirname }}/run_tempest.sh --no-virtual-env --serial ceilometer.tests.tempest.api.test_telemetry_notification_api
-  vars_files:
-    - common/test-vars.yml
-

tests/test-gnocchi-storage.yml

@@ -29,6 +29,5 @@
 
 - include: test-install-ceilometer.yml
 
+# Install and execute Tempest
 - include: common/test-install-tempest.yml
-
-- include: test-functional-ceilometer.yml

tests/test.yml

@@ -30,6 +30,5 @@
 
 - include: test-install-ceilometer.yml
 
+# Install and execute Tempest
 - include: common/test-install-tempest.yml
-
-- include: test-functional-ceilometer.yml