Change to Puppet Litmus

Change-Id: I6fb014c6cf8e406deea771b87ecf7a1b4edb376a
2020-09-20 18:56:20 +02:00 · 2020-09-20 18:56:20 +02:00 · 431ea31c25
commit 431ea31c25
parent 2cf3c76ae6
12 changed files with 6 additions and 112 deletions
--- 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
--- 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
 -----------

--- a/spec/acceptance/nodesets/centos-70-x64.yml
+++ b/spec/acceptance/nodesets/centos-70-x64.yml
@ -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
--- a/spec/acceptance/nodesets/centos-libvirt-x64.yml
+++ b/spec/acceptance/nodesets/centos-libvirt-x64.yml
@ -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
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@ -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
--- a/spec/acceptance/nodesets/nodepool-bionic.yml
+++ b/spec/acceptance/nodesets/nodepool-bionic.yml
@ -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
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ b/spec/acceptance/nodesets/nodepool-centos7.yml
@ -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
--- a/spec/acceptance/nodesets/nodepool-centos8.yml
+++ b/spec/acceptance/nodesets/nodepool-centos8.yml
@ -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
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ b/spec/acceptance/nodesets/nodepool-trusty.yml
@ -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
--- a/spec/acceptance/nodesets/nodepool-xenial.yml
+++ b/spec/acceptance/nodesets/nodepool-xenial.yml
@ -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
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@ -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
--- 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'