Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
Signed-off-by: Corey Hemminger <[email protected]>
  • Loading branch information
Stromweld committed Jun 21, 2024
1 parent 574395c commit 61bf936
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion kitchen.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provisioner:
platforms:
- name: windows
driver_config:
image: mcr.microsoft.com/windows/servercore:1809
image: mcr.microsoft.com/windows/servercore:ltsc2022
platform: windows

suites:
Expand Down
2 changes: 1 addition & 1 deletion kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ suites:
driver:
build_context: false
- name: capabilities
includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
includes: [debian-12, ubuntu-22.04, ubuntu-24.04]
driver:
provision_command:
- curl -L https://www.chef.io/chef/install.sh | bash
Expand Down
24 changes: 12 additions & 12 deletions lib/docker/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

begin
require "docker"

# Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
# This override is for the docker-api gem to communicate to the Docker engine on Windows
module Docker
VERSION = "0.0.0".freeze
API_VERSION = "1.24".freeze
end
rescue LoadError => e
logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
end
# begin
# require "docker"
#
# # Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
# # This override is for the docker-api gem to communicate to the Docker engine on Windows
# module Docker
# VERSION = "0.0.0".freeze
# API_VERSION = "1.24".freeze
# end
# rescue LoadError => e
# logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
# end
2 changes: 1 addition & 1 deletion test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:7
FROM almalinux:7
RUN yum clean all
RUN yum install -y sudo openssh-server openssh-clients which curl htop
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
Expand Down
12 changes: 6 additions & 6 deletions test/integration/default/disabled/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.
#

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

Check failure on line 18 in test/integration/default/disabled/default_spec.rb

View workflow job for this annotation

GitHub Actions / lint-unit / Chefstyle on Ruby (3.3)

[Correctable] Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
require 'spec_helper'

Check failure on line 19 in test/integration/default/disabled/default_spec.rb

View workflow job for this annotation

GitHub Actions / lint-unit / Chefstyle on Ruby (3.3)

[Correctable] Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

# # Just make sure the image launched and is reachable.
# describe command('true') do
# its(:exit_status) { is_expected.to eq 0 }
# end
describe command('true') do

Check failure on line 22 in test/integration/default/disabled/default_spec.rb

View workflow job for this annotation

GitHub Actions / lint-unit / Chefstyle on Ruby (3.3)

[Correctable] Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
its(:exit_status) { is_expected.to eq 0 }
end

0 comments on commit 61bf936

Please sign in to comment.