Merge "Add Puppet Litmus"

.zuul.yaml

@@ -3,5 +3,5 @@
       - 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

README.md

@@ -16,8 +16,7 @@ VSwitch
 4. [Release Notes - Release notes for the project](#release-notes)
 5. [Repository - The project source code repository](#repository)
 6. [Usage - The usage of the module](#usage)
-7. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rspec)
+7. [TODO - What to do next](#todo)
-8. [TODO - What to do next](#todo)
 
 Overview
 --------
@@ -107,18 +106,6 @@ vs_config { 'array_key':
 }
 ```
 
-Beaker-Rspec
--------------
-
-This module has beaker-rspec tests
-
-To run:
-
-```shell
-bundle install
-bundle exec rspec spec/acceptance
-```
-
 TODO:
 -------------
 * OpenFlow controller settings

spec/acceptance/basic_vswitch_spec.rb

@@ -11,7 +11,7 @@ describe 'basic vswitch' do
 
       include vswitch::ovs
 
-      vs_bridge { 'br-beaker':
+      vs_bridge { 'br-ci':
         ensure => present,
       }
 
@@ -27,17 +27,15 @@ describe 'basic vswitch' do
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe command('ovs-vsctl show') do
+    it 'should have br-ci bridge' do
-      describe '#stdout' do
+      command('ovs-vsctl show') do |r|
-        subject { super().stdout }
+        expect(r.stdout).to match(/br-ci/)
-        it { is_expected.to match /br-beaker/ }
       end
     end
 
-    describe command('ovs-vsctl get Open_vSwitch . external_ids:ovn-remote') do
+    it 'should get remote addr' do
-      describe '#stdout' do
+      command('ovs-vsctl get Open_vSwitch . external_ids:ovn-remote') do |r|
-        subject { super().stdout }
+        expect(r.stdout).to match(/\"tcp:127.0.0.1:2300\"/)
-        it { is_expected.to match /\"tcp:127.0.0.1:2300\"/ }
       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'