Merge "Add Puppet Litmus"

.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

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/
 

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 'should show successfully' do
-      it 'list virtual ports' do
+      command('ovn-nbctl show') do |r|
-        expect(shell('ovn-nbctl show').exit_code).to be_zero
+        expect(r.exit_code).to eq 0
       end
     end
   end

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

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

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

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

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

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

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

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

spec/spec_helper_acceptance.rb

@@ -1 +1 @@
-require 'puppet-openstack_spec_helper/beaker_spec_helper'
+require 'puppet-openstack_spec_helper/litmus_spec_helper'