Skip to content

fix: remove Cirrus CI persistent worker integration - #883

Open
deekay2310 wants to merge 1 commit into
redhat-developer:mainfrom
deekay2310:fix/remove-cirrus-ci
Open

fix: remove Cirrus CI persistent worker integration#883
deekay2310 wants to merge 1 commit into
redhat-developer:mainfrom
deekay2310:fix/remove-cirrus-ci

Conversation

@deekay2310

Copy link
Copy Markdown
Contributor

Summary

Closes #859.

Cirrus CI shut down on June 1, 2026 when Cirrus Labs joined OpenAI. This PR removes all dead Cirrus CI persistent worker code from the codebase:

  • pkg/integrations/cirrus/ — deleted entirely (Go package, shell/ps1 setup snippets)
  • CLI flags--it-cirrus-pw-token and --it-cirrus-pw-labels removed from all 8 command files (AWS rhel/fedora/windows/mac-pool, Azure rhel/windows, IBM power/z) and from params.go
  • Security groups — port 3010 ingress rules removed from AWS fedora, EKS, and mac machine modules
  • ContextCirrusPWArgs field removed from ContextArgs and integration init
  • Cloud-config templates — Cirrus blocks removed from rhel (base + snc) and fedora cloud-config files
  • Bootstrap scripts — Cirrus blocks removed from Windows bootstrap.ps1, Azure rhqp-ci-setup.ps1 (including $cirrusToken param), and Mac request.sh
  • Azure WindowscirrusToken removed from powershell command format strings
  • Docs — Cirrus line removed from README integrations list, flag docs removed from ibm-power.md and ibm-z.md
  • Stale TODO — removed an outdated TODO comment in mac-pool.go that listed cirrus-persistent-worker as a future integration mode; this design direction was superseded by the current context-args pattern where integrations are selected via GHRunnerArgs/GLRunnerArgs fields

35 files changed, 437 lines removed. No functional changes to remaining integrations (GitHub Actions, GitLab Runner).

Test plan

  • go build ./... passes — pure dead-code removal, no logic changes to remaining integrations

🤖 Generated with Claude Code

…#859)

Cirrus CI shut down on June 1, 2026. Remove all dead code: the
pkg/integrations/cirrus package, CLI flags (--it-cirrus-pw-token,
--it-cirrus-pw-labels), port 3010 security group rules, template
snippets, and documentation references.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: fe8ab1c5-61cd-42bf-8062-b2dfd9afd38c

📥 Commits

Reviewing files that changed from the base of the PR and between 6c81272 and a0e1a16.

📒 Files selected for processing (35)
  • README.md
  • cmd/mapt/cmd/aws/hosts/fedora.go
  • cmd/mapt/cmd/aws/hosts/rhel.go
  • cmd/mapt/cmd/aws/hosts/windows.go
  • cmd/mapt/cmd/aws/services/mac-pool.go
  • cmd/mapt/cmd/azure/hosts/rhel.go
  • cmd/mapt/cmd/azure/hosts/windows.go
  • cmd/mapt/cmd/ibmcloud/hosts/ibm-power.go
  • cmd/mapt/cmd/ibmcloud/hosts/ibm-z.go
  • cmd/mapt/cmd/params/params.go
  • docs/ibmcloud/ibm-power.md
  • docs/ibmcloud/ibm-z.md
  • pkg/integrations/cirrus/persistentworker.go
  • pkg/integrations/cirrus/snippet-darwin.sh
  • pkg/integrations/cirrus/snippet-linux.sh
  • pkg/integrations/cirrus/snippet-windows.ps1
  • pkg/integrations/cirrus/types.go
  • pkg/integrations/integrations.go
  • pkg/manager/context/context.go
  • pkg/provider/aws/action/eks/eks.go
  • pkg/provider/aws/action/fedora/fedora.go
  • pkg/provider/aws/action/mac-pool/mac-pool.go
  • pkg/provider/aws/modules/mac/machine/machine.go
  • pkg/provider/aws/modules/mac/machine/setup/request.sh
  • pkg/provider/aws/modules/mac/machine/setup/setup.go
  • pkg/provider/azure/action/windows/rhqp-ci-setup.ps1
  • pkg/provider/azure/action/windows/windows.go
  • pkg/target/host/fedora/cloud-config
  • pkg/target/host/fedora/fedora.go
  • pkg/target/host/rhel/cloud-config-base
  • pkg/target/host/rhel/cloud-config-snc
  • pkg/target/host/rhel/cloud-config.go
  • pkg/target/host/windows-server/bootstrap.ps1
  • pkg/target/host/windows-server/windows-server.go
  • pkg/util/cloud-init/util.go
💤 Files with no reviewable changes (31)
  • pkg/integrations/cirrus/snippet-linux.sh
  • pkg/integrations/cirrus/snippet-windows.ps1
  • cmd/mapt/cmd/ibmcloud/hosts/ibm-power.go
  • pkg/integrations/cirrus/snippet-darwin.sh
  • README.md
  • docs/ibmcloud/ibm-power.md
  • cmd/mapt/cmd/aws/hosts/rhel.go
  • pkg/provider/aws/modules/mac/machine/machine.go
  • pkg/integrations/cirrus/types.go
  • pkg/provider/azure/action/windows/rhqp-ci-setup.ps1
  • cmd/mapt/cmd/azure/hosts/windows.go
  • cmd/mapt/cmd/aws/hosts/windows.go
  • cmd/mapt/cmd/aws/hosts/fedora.go
  • docs/ibmcloud/ibm-z.md
  • pkg/manager/context/context.go
  • pkg/provider/aws/action/eks/eks.go
  • cmd/mapt/cmd/ibmcloud/hosts/ibm-z.go
  • pkg/provider/aws/action/fedora/fedora.go
  • pkg/provider/aws/modules/mac/machine/setup/request.sh
  • pkg/target/host/rhel/cloud-config-snc
  • cmd/mapt/cmd/aws/services/mac-pool.go
  • cmd/mapt/cmd/azure/hosts/rhel.go
  • pkg/integrations/cirrus/persistentworker.go
  • pkg/target/host/windows-server/bootstrap.ps1
  • pkg/target/host/windows-server/windows-server.go
  • pkg/provider/aws/modules/mac/machine/setup/setup.go
  • pkg/target/host/rhel/cloud-config.go
  • pkg/provider/aws/action/mac-pool/mac-pool.go
  • pkg/target/host/fedora/cloud-config
  • pkg/target/host/fedora/fedora.go
  • cmd/mapt/cmd/params/params.go

📝 Walkthrough

Summary by CodeRabbit

  • Changes
    • Removed Cirrus persistent worker integration and related setup from supported host and machine provisioning workflows.
    • Removed Cirrus-specific CLI options and documentation entries.
    • Retained GitHub Actions and GitLab Runner integrations across supported platforms.
    • Removed Cirrus-specific security-group access and bootstrap configuration.
  • Documentation
    • Updated integration and command documentation to reflect the available provisioning options.
  • Refactor
    • Simplified runner configuration and cloud-init generation after removing Cirrus support.

Walkthrough

The pull request removes Cirrus persistent-worker support from command wiring, shared integration management, cloud provisioning, security-group configuration, embedded setup scripts, and documentation. GitHub Actions and GitLab Runner support remain.

Changes

Cirrus integration removal

Layer / File(s) Summary
Remove integration contracts and security-group access
pkg/manager/context/context.go, pkg/provider/aws/action/eks/eks.go
The shared Cirrus context and initialization path are removed. The optional Cirrus port ingress rule is removed from EKS security groups.
Remove Cirrus command options
cmd/mapt/cmd/**, README.md, docs/ibmcloud/*
Host creation commands no longer pass Cirrus arguments or register Cirrus flags. Documentation no longer lists the removed integration or options.
Remove Cirrus host provisioning
pkg/provider/**, pkg/target/host/**, pkg/integrations/integrations.go, pkg/util/cloud-init/util.go
Fedora, RHEL, Windows, and macOS setup no longer generate or install Cirrus services, snippets, tokens, or startup scripts. Remaining runner setup is preserved.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: adrianriobo

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 66.67% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely states that the obsolete Cirrus CI persistent worker integration is removed.
Description check ✅ Passed The description directly explains the Cirrus CI removal, affected areas, and reported build test.
Linked Issues check ✅ Passed The changes satisfy [#859] by removing the Cirrus package, related flags, and port 3010 security-group rules.
Out of Scope Changes check ✅ Passed The changes remain within the stated Cirrus CI removal scope, including cleanup of related templates, scripts, documentation, and a stale TODO.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

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.

Remove Cirrus CI persistent worker integration (service shut down)

1 participant