fix: release please configs

Signed-off-by: Corey Hemminger <[email protected]> Signed-off-by: Andrew Bobulsky <[email protected]> add codeowners Signed-off-by: Corey Hemminger <[email protected]> test Signed-off-by: Corey Hemminger <[email protected]> test Signed-off-by: Corey Hemminger <[email protected]> test Signed-off-by: Corey Hemminger <[email protected]>
test-kitchen · Jul 3, 2024 · ccc3c94 · ccc3c94
1 parent 2004b94
commit ccc3c94
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 41 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+@test-kitchen/maintainers
diff --git a/.github/workflows/ci.yml → .github/workflows/lint.yml b/.github/workflows/ci.yml → .github/workflows/lint.yml
@@ -1,12 +1,12 @@
 ---
-name: Lint & Unit
+name: 'Lint, Unit & Integration Tests'
 
 "on":
   pull_request:
 
 jobs:
   lint-unit:
-    uses: test-kitchen/.github/.github/workflows/lint-unit.yml@v0.1.2
+    uses: test-kitchen/.github/.github/workflows/lint-unit.yml@main
 
   integration-windows:
     name: Windows ${{matrix.suite}} ${{matrix.os}}
@@ -16,16 +16,17 @@ jobs:
       fail-fast: false
       matrix:
         suite: [default]
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
+        ruby: ["3.3"]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: ${{ matrix.ruby }}
           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}}
@@ -41,28 +42,27 @@ jobs:
           - amd64
           - inspec
         os:
-          - amazonlinux-2
-          - ubuntu-1804
-          - ubuntu-2004
+          - amazonlinux-2023
+          - ubuntu-2204
+          - ubuntu-2404
           - fedora-latest
-          - centos-7
-          - oraclelinux-7
-          - rockylinux-8
-          - debian-11
+          - almalinux-9
+          - rockylinux-9
           - debian-12
           - opensuse-15
           - dockerfile
+        ruby: ["3.3"]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: ${{ matrix.ruby }}
           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 }}
+      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} -l debug
 
   integration-capabilities:
     name: Linux ${{matrix.suite}} ${{matrix.os}}
@@ -73,13 +73,14 @@ jobs:
       matrix:
         suite:
           - capabilities
-        os: [debian-11, ubuntu-1804, ubuntu-2004]
+        os: [debian-12, ubuntu-2204, ubuntu-2404]
+        ruby: ["3.3"]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: ${{ matrix.ruby }}
           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/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -9,12 +9,9 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: googleapis/release-please-action@v4
         id: release
         with:
-          release-type: ruby
-          package-name: kitchen-docker
-          version-file: lib/kitchen/driver/docker_version.rb
           token: ${{ secrets.PORTER_GITHUB_TOKEN }}
 
       - name: Checkout

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -1,8 +1,6 @@
+---
 default: true
+MD004: false
+MD012: false
 MD013: false
 MD024: false
-MD026: false
-MD036: false
-MD012: false
-MD029: false
-MD004: false
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "3.2.0"
+}
diff --git 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/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/lib/kitchen/transport/docker.rb b/lib/kitchen/transport/docker.rb
@@ -18,15 +18,15 @@
 
 require_relative "../docker/helpers/inspec_helper"
 
-require_relative "../../docker/version"
+# require_relative "../../docker/version"
 require_relative "../../train/docker"
 
 module Kitchen
   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/release-please-config.json b/release-please-config.json
@@ -0,0 +1,12 @@
+{
+  "packages": {
+    ".": {
+      "package-name": "kitchen-docker",
+      "changelog-path": "CHANGELOG.md",
+      "release-type": "ruby",
+      "include-component-in-tag": false,
+      "version-file": "lib/kitchen/docker/docker_version.rb"
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}