From f62124fbf4a65e590589fee2d24530d9548b484b Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:50:15 +0200 Subject: [PATCH] Add Puppet Litmus Depends-On: https://review.opendev.org/#/c/752202/ Change-Id: Iec4fc302750a0a5e26a8e8d519f66ad8c5c07a65 --- .zuul.yaml | 2 +- README.md | 15 --------------- spec/acceptance/basic_ovn_spec.rb | 6 +++--- 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, 5 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 c2f4c34..d955862 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,5 +2,5 @@ templates: - puppet-openstack-check-jobs - puppet-openstack-module-unit-jobs - - puppet-openstack-beaker-jobs + - puppet-openstack-litmus-jobs - release-notes-jobs-python3 diff --git a/README.md b/README.md index 68ccb42..0caf0f4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Team and repository tags 2. [Module Description - What the module does and why it is useful](#module-description) 3. [Setup - The basics of getting started with ovn](#setup) * [What ovn affects](#what-ovn-affects) -4. [Functional testing with Beaker-Rspec](#Beaker-Rspec) ## Overview @@ -41,20 +40,6 @@ of its parameters * ovn_encap_type - Encapsulation type to be used by this controller. Defaults to geneve -## Beaker-Rspec - -This module has beaker-rspec tests. -To run the tests on the default vagrant node: - -```shell -bundle install -bundle exec rake acceptance -``` - -For more information on writing and running beaker-rspec tests visit the documentation: - -* https://github.com/puppetlabs/beaker-rspec/blob/master/README.md - Release notes for the project can be found at: https://docs.openstack.org/releasenotes/puppet-ovn/ diff --git a/spec/acceptance/basic_ovn_spec.rb b/spec/acceptance/basic_ovn_spec.rb index 3d400d9..9d3c8f9 100644 --- a/spec/acceptance/basic_ovn_spec.rb +++ b/spec/acceptance/basic_ovn_spec.rb @@ -20,9 +20,9 @@ describe 'basic ovn deployment' do apply_manifest(pp, :catch_changes => true) end - describe 'test openvswitch-ovn CLI' do - it 'list virtual ports' do - expect(shell('ovn-nbctl show').exit_code).to be_zero + it 'should show successfully' do + command('ovn-nbctl show') do |r| + expect(r.exit_code).to eq 0 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 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/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 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 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 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 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 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 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 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 9196bc9..d51dfdb 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'