From f676b88e3223bfbfc08b6d6c95b6e9c69f53f67c Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:42:04 +0200 Subject: [PATCH] Add Puppet Litmus Depends-On: https://review.opendev.org/#/c/740601/ Change-Id: Id5f3ab3fdd9292de2c4ffe6cbca8e812273ca079 --- .zuul.yaml | 2 +- README.md | 21 ++++--------------- spec/acceptance/basic_neutron_spec.rb | 2 +- spec/acceptance/nodesets/centos-70-x64.yml | 11 ---------- spec/acceptance/nodesets/default.yml | 10 --------- spec/acceptance/nodesets/nodepool-bionic.yml | 10 --------- spec/acceptance/nodesets/nodepool-centos7.yml | 10 --------- spec/acceptance/nodesets/nodepool-centos8.yml | 10 --------- spec/acceptance/nodesets/nodepool-trusty.yml | 10 --------- spec/acceptance/nodesets/nodepool-xenial.yml | 10 --------- .../nodesets/ubuntu-server-1404-x64.yml | 11 ---------- spec/spec_helper_acceptance.rb | 2 +- 12 files changed, 7 insertions(+), 102 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-bionic.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/ubuntu-server-1404-x64.yml diff --git a/.zuul.yaml b/.zuul.yaml index bbacf2262..dfd00f46a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,7 @@ - puppet-openstack-check-jobs - puppet-openstack-module-unit-jobs - puppet-openstack-integration-jobs-all - - puppet-openstack-beaker-jobs + - puppet-openstack-litmus-jobs - release-notes-jobs-python3 check: jobs: diff --git a/README.md b/README.md index 834bd912e..bc0675b86 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,10 @@ neutron 3. [Setup - Tha basics of getting started with neutron.](#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. [Contributors - Those with commits](#contributors) -9. [Release Notes - Release notes for the project](#release-notes) -10. [Repository - The project source code repository](#repository) +6. [Development - Guide for contributing to the module](#development) +7. [Contributors - Those with commits](#contributors) +8. [Release Notes - Release notes for the project](#release-notes) +9. [Repository - The project source code repository](#repository) Overview -------- @@ -150,18 +149,6 @@ The following platforms are supported: * RHEL 6 * Fedora 18 -Beaker-Rspec ------------- - -This module has beaker-rspec tests - -To run: - -```shell -bundle install -bundle exec rspec spec/acceptance -``` - Development ----------- diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb index 4d4ed3f65..b3c06f47c 100644 --- a/spec/acceptance/basic_neutron_spec.rb +++ b/spec/acceptance/basic_neutron_spec.rb @@ -27,7 +27,7 @@ describe 'basic neutron' do describe 'test Neutron OVS agent bridges' do it 'should list OVS bridges' do - shell("ovs-vsctl show") do |r| + command("ovs-vsctl show") do |r| expect(r.stdout).to match(/br-int/) expect(r.stdout).to match(/br-tun/) end diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index 5f097e9fe..000000000 --- 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/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 486b6a34e..000000000 --- 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 index ad73cc503..000000000 --- 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 index c55287420..000000000 --- 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 index 4111da176..000000000 --- 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 9fc624e24..000000000 --- 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 index 99dd31877..000000000 --- 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 index 8001929b2..000000000 --- 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 9196bc99b..d51dfdbf6 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'