From 9243448ba1f0147ccba55ab0f3f9f288febb0011 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 11 Sep 2020 12:01:32 +0200 Subject: [PATCH] Remove beaker Change-Id: I6b6a2c66522fbc9455d3953cca9d1ec22c4d5ae6 --- README.md | 37 ++----------------- spec/acceptance/ceph_mon_osd_spec.rb | 19 ++++++---- spec/acceptance/nodesets/centos-70-x64.yml | 15 -------- spec/acceptance/nodesets/default.yml | 22 ----------- spec/acceptance/nodesets/nodepool-centos7.yml | 13 ------- spec/acceptance/nodesets/nodepool-centos8.yml | 10 ----- spec/acceptance/nodesets/nodepool-trusty.yml | 13 ------- spec/acceptance/nodesets/nodepool-xenial.yml | 13 ------- .../acceptance/nodesets/two-centos-70-x64.yml | 22 ----------- .../nodesets/two-ubuntu-server-1404-x64.yml | 22 ----------- .../nodesets/ubuntu-server-1404-x64.yml | 15 -------- spec/spec_helper_acceptance.rb | 2 +- 12 files changed, 15 insertions(+), 188 deletions(-) delete mode 100644 spec/acceptance/nodesets/centos-70-x64.yml delete mode 100644 spec/acceptance/nodesets/default.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos7.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos8.yml delete mode 100644 spec/acceptance/nodesets/nodepool-trusty.yml delete mode 100644 spec/acceptance/nodesets/nodepool-xenial.yml delete mode 100644 spec/acceptance/nodesets/two-centos-70-x64.yml delete mode 100644 spec/acceptance/nodesets/two-ubuntu-server-1404-x64.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/README.md b/README.md index e4b53cc8..052decfd 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,9 @@ ceph 5. [Limitations - OS compatibility, etc.](#limitations) 6. [Use Cases - Examples of how to use this module](#limitations) 7. [Development - Guide for contributing to the module](#development) -8. [Beaker Integration Tests - Apply the module and test results](#beaker-integration-tests) -9. [Contributors - Those with commits](#contributors) -10. [Release Notes - Notes on the most recent updates to the module](#release-notes) -11. [Repository - Repository for the module](#repository) +8. [Contributors - Those with commits](#contributors) +9. [Release Notes - Notes on the most recent updates to the module](#release-notes) +10. [Repository - Repository for the module](#repository) Overview -------- @@ -81,36 +80,6 @@ IRC channels: * irc.freenode.net#puppet-openstack * irc.oftc.net#ceph-devel -Beaker Integration Tests ------------------------- - -Relies on -[rspec-beaker](https://github.com/puppetlabs/beaker-rspec) -and tests are in spec/acceptance. -It also requires [Vagrant and Virtualbox](http://docs-v1.vagrantup.com/v1/docs/getting-started/) -. - -``` -bundle install -bundle exec rspec spec/acceptance -``` - -The BEAKER_set environment variable contains the resource set of linux -distribution configurations for which integration tests are going -to be run. Available values are - -* two-centos-70-x64 -* centos-70-x64 -* two-ubuntu-server-1404-x64 -* ubuntu-server-1404-x64 - -The default is - -``` -BEAKER_set=two-ubuntu-server-1404-x64 \ -bundle exec rspec spec/acceptance -``` - Development ----------- diff --git a/spec/acceptance/ceph_mon_osd_spec.rb b/spec/acceptance/ceph_mon_osd_spec.rb index 18f5466c..a44bfa3a 100644 --- a/spec/acceptance/ceph_mon_osd_spec.rb +++ b/spec/acceptance/ceph_mon_osd_spec.rb @@ -54,17 +54,20 @@ describe 'ceph mon osd' do apply_manifest(pp, :catch_changes => true) if os[:family].casecmp('RedHat') == 0 - shell 'sleep 10' # we need to wait a bit until the OSD is up - - shell 'ceph -s', { :acceptable_exit_codes => [0] } do |r| - expect(r.stdout).to match(/mon: 1 daemons/) - expect(r.stderr).to be_empty + describe command('sleep 10') do + its(:exit_status) { should eq 0 } end - shell 'ceph osd tree | grep osd.0', { :acceptable_exit_codes => [0] } do |r| - expect(r.stdout).to match(/up/) - expect(r.stderr).to be_empty + describe command('ceph -s') do + its(:exit_status) { should eq 0 } + its(:stdout) { should match /mon: 1 daemons/) } + its(:stderr) { should be_empty } end + + describe command('ceph osd tree | grep osd.0') do + its(:exit_status) { should eq 0 } + its(:stdout) { should match /up/ } + its(:stderr) { should be_empty } end end end diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index b75c1f17..00000000 --- a/spec/acceptance/nodesets/centos-70-x64.yml +++ /dev/null @@ -1,15 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - - osd - - client - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm - hypervisor: vagrant - ip: 10.11.12.2 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 1cdca667..00000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - platform: ubuntu-1404-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm - hypervisor: vagrant - ip: 10.11.12.2 - second: - roles: - - osd - - client - platform: ubuntu-1404-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm - hypervisor: vagrant - ip: 10.11.12.3 -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 index d52883df..00000000 --- a/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - - osd - - client - 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 index 4111da17..00000000 --- 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 index dc22d561..00000000 --- a/spec/acceptance/nodesets/nodepool-trusty.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - - osd - - client - 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 index 1f1c3c5e..00000000 --- a/spec/acceptance/nodesets/nodepool-xenial.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - - osd - - client - platform: ubuntu-16.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/two-centos-70-x64.yml b/spec/acceptance/nodesets/two-centos-70-x64.yml deleted file mode 100644 index d2607a38..00000000 --- a/spec/acceptance/nodesets/two-centos-70-x64.yml +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm - hypervisor: vagrant - ip: 10.11.12.2 - second: - roles: - - osd - - client - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm - hypervisor: vagrant - ip: 10.11.12.3 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/two-ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/two-ubuntu-server-1404-x64.yml deleted file mode 100644 index 1cdca667..00000000 --- a/spec/acceptance/nodesets/two-ubuntu-server-1404-x64.yml +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - platform: ubuntu-1404-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm - hypervisor: vagrant - ip: 10.11.12.2 - second: - roles: - - osd - - client - platform: ubuntu-1404-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm - hypervisor: vagrant - ip: 10.11.12.3 -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 index ff079275..00000000 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ /dev/null @@ -1,15 +0,0 @@ -HOSTS: - first: - roles: - - master - - mon - - osd - - client - platform: ubuntu-1404-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm - hypervisor: vagrant - ip: 10.11.12.2 -CONFIG: - type: foss - set_env: false diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 9196bc99..d51dfdbf 100644 --- 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'