Skip to content

Commit 61bf936

Browse files
committed
test
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
1 parent 574395c commit 61bf936

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

kitchen.windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ provisioner:
1818
platforms:
1919
- name: windows
2020
driver_config:
21-
image: mcr.microsoft.com/windows/servercore:1809
21+
image: mcr.microsoft.com/windows/servercore:ltsc2022
2222
platform: windows
2323

2424
suites:

kitchen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ suites:
4040
driver:
4141
build_context: false
4242
- name: capabilities
43-
includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
43+
includes: [debian-12, ubuntu-22.04, ubuntu-24.04]
4444
driver:
4545
provision_command:
4646
- curl -L https://www.chef.io/chef/install.sh | bash

lib/docker/version.rb

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313

14-
begin
15-
require "docker"
16-
17-
# Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
18-
# This override is for the docker-api gem to communicate to the Docker engine on Windows
19-
module Docker
20-
VERSION = "0.0.0".freeze
21-
API_VERSION = "1.24".freeze
22-
end
23-
rescue LoadError => e
24-
logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
25-
end
14+
# begin
15+
# require "docker"
16+
#
17+
# # Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
18+
# # This override is for the docker-api gem to communicate to the Docker engine on Windows
19+
# module Docker
20+
# VERSION = "0.0.0".freeze
21+
# API_VERSION = "1.24".freeze
22+
# end
23+
# rescue LoadError => e
24+
# logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
25+
# end

test/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos:7
1+
FROM almalinux:7
22
RUN yum clean all
33
RUN yum install -y sudo openssh-server openssh-clients which curl htop
44
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key

test/integration/default/disabled/default_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
# limitations under the License.
1515
#
1616

17-
# Disable now busser-serever is gone.
18-
# require 'serverspec'
19-
# require 'spec_helper'
17+
# Disable now busser-server is gone.
18+
require 'serverspec'
19+
require 'spec_helper'
2020

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

0 commit comments

Comments
 (0)