From 61bf9360a53d86efa7659f89db5a776ce32ee504 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 21 Jun 2024 12:36:16 -0500 Subject: [PATCH] test Signed-off-by: Corey Hemminger --- kitchen.windows.yml | 2 +- kitchen.yml | 2 +- lib/docker/version.rb | 24 +++++++++---------- test/Dockerfile | 2 +- .../default/disabled/default_spec.rb | 12 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kitchen.windows.yml b/kitchen.windows.yml index ef520bd..187482e 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -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: diff --git a/kitchen.yml b/kitchen.yml index 9d95c6c..b757841 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -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 diff --git a/lib/docker/version.rb b/lib/docker/version.rb index 1b4cb1c..257add8 100644 --- a/lib/docker/version.rb +++ b/lib/docker/version.rb @@ -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 diff --git a/test/Dockerfile b/test/Dockerfile index 4ecf596..5a84945 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -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 diff --git a/test/integration/default/disabled/default_spec.rb b/test/integration/default/disabled/default_spec.rb index 3a18256..3e55eba 100644 --- a/test/integration/default/disabled/default_spec.rb +++ b/test/integration/default/disabled/default_spec.rb @@ -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' +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 +describe command('true') do + its(:exit_status) { is_expected.to eq 0 } +end