Skip to content

fix: release please configs#418

Merged
damacus merged 37 commits into
mainfrom
fix-release-please
Jun 25, 2026
Merged

fix: release please configs#418
damacus merged 37 commits into
mainfrom
fix-release-please

Conversation

@Stromweld

@Stromweld Stromweld commented Jun 21, 2024

Copy link
Copy Markdown
Contributor

Description

This PR modernizes the kitchen-docker project across four areas: release automation, CI pipeline, integration test tooling, and Windows container support.

Release Please

  • Adds release-please-config.json and .release-please-manifest.json for config-file-based release-please v5 (replaces deprecated inline release-type/package-name/version-file params in publish.yaml)

CI Pipeline (ci.ymllint.yml)

  • Renamed workflow to better reflect scope: lint, unit, and integration tests
  • Added CHEF_LICENSE_KEY secret injection for licensed tooling
  • Removed docker/setup-buildx-action step from Windows job — the moby/buildkit:buildx-stable-1 image has no Windows manifest and the GHA windows-2022 runner already ships buildx as a CLI plugin
  • Updated capabilities matrix: replaced EOL ubuntu-2004 with ubuntu-2604

Integration Test Tooling

  • Replaced kitchen-inspec + embedded lib/train/docker.rb with kitchen-cinc-auditor + cinc-auditor-bin (open-source Cinc equivalents)
  • Removed lib/train/docker.rb (embedded train transport, 126 lines) — uses upstream train-docker gem instead
  • Removed lib/docker/version.rb (superseded by lib/kitchen/docker/docker_version.rb)
  • Added test/cookbooks/cinc_test and test/cookbooks/docker_test cookbooks for integration test suites
  • Added cross-platform InSpec profile (test/integration/cinc/inspec/cinc_spec.rb)
  • Updated Gemfile and Rakefile accordingly; switched .rubocop.yml from chefstyle to cookstyle/chefstyle

Windows Container Support

  • Fixed Docker socket detection: replaced windows_os? (which checked the target platform name) with Gem.win_platform? (which checks the host OS) in both driver.rb and transport.rb. Without this fix, Kitchen used unix:///var/run/docker.sock on a Windows host instead of npipe:////./pipe/docker_engine.
  • Added windows-2022 platform to kitchen.yml using mcr.microsoft.com/windows/servercore:ltsc2022 — a true Windows container, since GHA windows-2022 runners run Docker EE in Windows container mode and cannot pull Linux images
  • Installs Cinc via provision_command PowerShell one-liner; sets cinc_omnibus_root so Kitchen resolves the correct client path (C:\cinc-project\cinc\bin\cinc-client.bat)
  • Uses verifier: name: dummy for the Windows platform — cinc_auditor uses WinRM for Windows targets but Windows Server Core containers do not have WinRM configured; verify support is a follow-up

Issues Resolved

N/A — proactive modernization and CI fix.

Type of Change

fix — corrects broken Windows CI and updates tooling/release automation.

Check List


This PR was created with AI assistance using Hermes Agent v0.17.0 (claude-sonnet-4.6).

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
@Stromweld Stromweld self-assigned this Jun 21, 2024
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
@Stromweld Stromweld marked this pull request as draft July 1, 2024 21:54

@damacus damacus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are we at with this?

@damacus

damacus commented Mar 17, 2025

Copy link
Copy Markdown
Contributor

Blocks: #421 #422 #423 #424 #425 #427
cc/ @RulerOf

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
@Stromweld

Copy link
Copy Markdown
Contributor Author

sorry this fell off my radar

Stromweld added 16 commits June 22, 2026 12:11
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Stromweld added 12 commits June 23, 2026 10:32
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
The moby/buildkit:buildx-stable-1 image has no Windows manifest, causing
the docker-container driver to fail with "no matching manifest for
windows(10.0.26100)/amd64". The Windows runner already has buildx
installed as a CLI plugin, so the setup-buildx-action is unnecessary.

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
The windows_os? method checks the target platform name (e.g. ubuntu-24.04),
not the host machine running Kitchen. When running on a Windows host targeting
Linux containers, this caused the socket to incorrectly default to
unix:///var/run/docker.sock instead of npipe:////./pipe/docker_engine.

Replace driver.windows_os? / transport.windows_os? with Gem.win_platform?
which correctly detects the actual host operating system.

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
The Windows CI job was attempting to run Linux containers (ubuntu-24.04)
on a Windows Docker daemon in Windows container mode, which is impossible.
The Docker daemon on GHA windows-latest cannot pull Linux images.

Switch the Windows integration test to use actual Windows containers:
- Add windows-2022 platform using mcr.microsoft.com/windows/servercore:ltsc2022
- Update workflow matrix to target windows-2022 instead of ubuntu-2404
- Remove DOCKER_DEFAULT_PLATFORM env (not needed for native Windows containers)
- Make InSpec cinc-client version check cross-platform

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
…M, not docker exec)

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
…lobal skip)

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
@Stromweld Stromweld marked this pull request as ready for review June 24, 2026 22:07
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
"on":
pull_request:

env:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this if we're using cinc stuff

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into issues where cinc_auditor was still installing inspec and running inspec under the hood. This caused the license error on verify phase. We need to do a deeper dive and verify kitchen-cinc auditor is using cinc-auditor and there are no dependencies on inspec or inspec-core.

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
@Stromweld Stromweld requested a review from damacus June 25, 2026 15:48
@damacus damacus merged commit 9be9d75 into main Jun 25, 2026
105 checks passed
@damacus damacus deleted the fix-release-please branch June 25, 2026 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants