Skip to content

Commit

Permalink
Disable ServerSpec
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Webb <[email protected]>
  • Loading branch information
damacus committed Nov 14, 2023
1 parent 5036c0d commit 0632ece
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 24 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ jobs:
matrix:
suite:
- default
- no_build_context
- no-build-context
- arm64
- amd64
- inspec
os:
- amazonlinux-2
- ubuntu-18.04
- ubuntu-20.04
- ubuntu-1804
- ubuntu-2004
- fedora-latest
- centos-7
- centos-8
Expand All @@ -98,6 +98,8 @@ jobs:
with:
ruby-version: "3.1"
bundler-cache: true
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
Expand All @@ -111,7 +113,7 @@ jobs:
matrix:
suite:
- capabilities
os: [debian-11, ubuntu-18.04, ubuntu-20.04]
os: [debian-11, ubuntu-1804, ubuntu-2004]
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ suites:
driver:
build_context: false
- name: capabilities
includes: [debian-10, ubuntu-18.04, ubuntu-20.04]
includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
driver:
provision_command:
- curl -L https://www.chef.io/chef/install.sh | bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# limitations under the License.
#

require 'serverspec'
set :backend, :exec
# Disable now busser-serever is gone.
# require 'serverspec'
# set :backend, :exec

describe command('/sbin/ifconfig eth0 multicast') do
its(:exit_status) { is_expected.to_not eq 0 }
its(:stderr) { is_expected.to match /Operation not permitted/ }
end
# describe command('/sbin/ifconfig eth0 multicast') do
# its(:exit_status) { is_expected.to_not eq 0 }
# its(:stderr) { is_expected.to match /Operation not permitted/ }
# end
13 changes: 7 additions & 6 deletions test/integration/default/serverspec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# limitations under the License.
#

require 'serverspec'
require 'spec_helper'
# Disable now busser-serever is gone.
# require 'serverspec'
# require 'spec_helper'

# Just make sure the image launched and is reachable.
describe command('true') do
its(:exit_status) { is_expected.to eq 0 }
end
# # Just make sure the image launched and is reachable.
# describe command('true') do
# its(:exit_status) { is_expected.to eq 0 }
# end
14 changes: 7 additions & 7 deletions test/integration/default/serverspec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# limitations under the License.
#

case RbConfig::CONFIG['host_os']
when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
set :backend, :cmd
set :os, :family => 'windows'
else
set :backend, :exec
end
# case RbConfig::CONFIG['host_os']
# when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
# set :backend, :cmd
# set :os, :family => 'windows'
# else
# set :backend, :exec
# end

0 comments on commit 0632ece

Please sign in to comment.