diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 69ea0f4..3d1fe49 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: bundler-cache: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} + - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} -l debug integration-linux: name: Linux ${{matrix.suite}} ${{matrix.os}} @@ -62,7 +62,7 @@ jobs: 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 }} + - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} -l debug integration-capabilities: name: Linux ${{matrix.suite}} ${{matrix.os}} @@ -83,4 +83,4 @@ jobs: bundler-cache: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} + - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} -l debug diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d4f6f29..95a37e3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "3.0.0" + ".": "3.2.0" } diff --git a/kitchen.yml b/kitchen.yml index b757841..87140ab 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -13,7 +13,7 @@ provisioner: name: dummy platforms: - - name: amazonlinux-2023 + - name: amazonlinux-2 - name: ubuntu-22.04 - name: ubuntu-24.04 - name: fedora-latest diff --git a/lib/kitchen/transport/docker.rb b/lib/kitchen/transport/docker.rb index 10b6e25..0119eb5 100644 --- a/lib/kitchen/transport/docker.rb +++ b/lib/kitchen/transport/docker.rb @@ -18,7 +18,7 @@ require_relative "../docker/helpers/inspec_helper" -require_relative "../../docker/version" +# require_relative "../../docker/version" require_relative "../../train/docker" module Kitchen @@ -26,7 +26,7 @@ module Transport class Docker < Kitchen::Transport::Base class DockerFailed < TransportFailed; end - kitchen_transport_api_version 1 + # kitchen_transport_api_version 1 plugin_version Kitchen::VERSION default_config :binary, "docker" diff --git a/test/Dockerfile b/test/Dockerfile index 5a84945..d9222f7 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:7 +FROM almalinux:latest 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 2d0dbda..cd48e09 100644 --- a/test/integration/default/disabled/default_spec.rb +++ b/test/integration/default/disabled/default_spec.rb @@ -15,10 +15,10 @@ # # 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 +# 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