Change to Puppet Litmus

Change-Id: I6fb014c6cf8e406deea771b87ecf7a1b4edb376a

diff --git a/.zuul.yaml b/.zuul.yaml
index 5f1fa1abf84a49557e6639a2754a85dfad09436d..f78bae9f165e3adf6011aebf1bb4cbbbb7dc94bd 100644 (file)
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,5 +3,5 @@
       - puppet-openstack-check-jobs
       - puppet-openstack-module-unit-jobs
       - puppet-openstack-integration-jobs-scenario001
-      - puppet-openstack-beaker-jobs
+      - puppet-openstack-litmus-jobs
       - release-notes-jobs-python3

diff --git a/README.md b/README.md
index 44b30afc74d618f4363312fa76d1443275b4d1ea..c7e00335742480985b08bbc8729e1525fd39a1d5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -15,11 +15,10 @@ Ceilometer
 3. [Setup - The basics of getting started with ceilometer](#setup)
 4. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
 5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rspec)
-7. [Development - Guide for contributing to the module](#development)
-8. [Release Notes - Release notes for the project](#release-notes)
-9. [Contributors - Those with commits](#contributors)
-10. [Repository - The project source code repository](#repository)
+6. [Development - Guide for contributing to the module](#development)
+7. [Release Notes - Release notes for the project](#release-notes)
+8. [Contributors - Those with commits](#contributors)
+9. [Repository - The project source code repository](#repository)
 
 Overview
 --------
@@ -112,18 +111,6 @@ Limitations
 
 * The ceilometer modules have only been tested on RedHat and Ubuntu family systems.
 
-Beaker-Rspec
-------------
-
-This module has beaker-rspec tests
-
-To run:
-
-``shell
-bundle install
-bundle exec rspec spec/acceptance
-``
-
 Development
 -----------
 

diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
deleted file mode 100644 (file)
index 5f097e9..0000000
--- a/spec/acceptance/nodesets/centos-70-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-server-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box: puppetlabs/centos-7.0-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss

diff --git a/spec/acceptance/nodesets/centos-libvirt-x64.yml b/spec/acceptance/nodesets/centos-libvirt-x64.yml
deleted file mode 100644 (file)
index 5ffe864..0000000
--- a/spec/acceptance/nodesets/centos-libvirt-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-libvirt-7-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box: centos/7
-    box_url: https://vagrantcloud.com/centos/7
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644 (file)
index 486b6a3..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  type: foss

diff --git a/spec/acceptance/nodesets/nodepool-bionic.yml b/spec/acceptance/nodesets/nodepool-bionic.yml
deleted file mode 100644 (file)
index ad73cc5..0000000
--- a/spec/acceptance/nodesets/nodepool-bionic.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-18.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-18.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false

diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
deleted file mode 100644 (file)
index c552874..0000000
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false

diff --git a/spec/acceptance/nodesets/nodepool-centos8.yml b/spec/acceptance/nodesets/nodepool-centos8.yml
deleted file mode 100644 (file)
index 4111da1..0000000
--- a/spec/acceptance/nodesets/nodepool-centos8.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-80-x64:
-    roles:
-      - master
-    platform: el-8-x86_64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false

diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
deleted file mode 100644 (file)
index 9fc624e..0000000
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false

diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
deleted file mode 100644 (file)
index 99dd318..0000000
--- a/spec/acceptance/nodesets/nodepool-xenial.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-16.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-16.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false

diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644 (file)
index 8001929..0000000
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 9196bc99bc39bc8b973c5cb017a3b66911399685..d51dfdbf6f3fd0aba25f63ffcd59b7ea1beb82e1 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1 +1 @@
-require 'puppet-openstack_spec_helper/beaker_spec_helper'
+require 'puppet-openstack_spec_helper/litmus_spec_helper'