Skip to content

Conversation

@richm
Copy link
Contributor

@richm richm commented Feb 4, 2026

The new ansible-lint@v26 does not like it when there is a .collection directory
with a galaxy.yml in the converted collection, so remove it, since it is not
needed for ansible-lint.

Signed-off-by: Rich Megginson rmeggins@redhat.com

Summary by Sourcery

CI:

  • Extend ansible-lint workflow cleanup to delete the converted collection's .collection directory in addition to existing artifacts.

…tion [citest_skip]

The new ansible-lint@v26 does not like it when there is a .collection directory
with a galaxy.yml in the converted collection, so remove it, since it is not
needed for ansible-lint.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
@richm richm requested a review from spetrosi as a code owner February 4, 2026 20:48
@richm richm self-assigned this Feb 4, 2026
@sourcery-ai
Copy link

sourcery-ai bot commented Feb 4, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR updates the ansible-lint GitHub Actions workflow to clean up an additional directory (.collection) from the converted Ansible collection before running ansible-lint v26, aligning the CI environment with the linter’s new expectations.

Sequence diagram for updated ansible-lint CI cleanup step

sequenceDiagram
    participant GitHubActionsRunner
    participant AnsibleLintWorkflow
    participant Tox
    participant CollectionConversion
    participant CleanupStep
    participant AnsibleLint

    GitHubActionsRunner->>AnsibleLintWorkflow: Trigger workflow on push or PR
    AnsibleLintWorkflow->>Tox: Run lsr_ci_runtox with TOXENV=collection
    Tox->>CollectionConversion: Convert role to collection
    CollectionConversion-->>Tox: Collection in .tox/ansible_collections
    Tox-->>AnsibleLintWorkflow: Conversion completed

    AnsibleLintWorkflow->>CleanupStep: Prepare collection directory
    CleanupStep->>CleanupStep: rm -rf coll_dir/.ansible
    CleanupStep->>CleanupStep: rm -rf .tox/ansible-plugin-scan
    CleanupStep->>CleanupStep: rm -rf coll_dir/.collection

    CleanupStep-->>AnsibleLintWorkflow: Collection directory cleaned
    AnsibleLintWorkflow->>AnsibleLint: Run ansible-lint v26 on converted collection
    AnsibleLint-->>GitHubActionsRunner: Report lint results
Loading

Flow diagram for CI cleanup of converted Ansible collection

flowchart TD
    A[Start ansible-lint workflow job] --> B[Run lsr_ci_runtox with TOXENV=collection]
    B --> C[Create converted collection in .tox/ansible_collections]
    C --> D[Set coll_dir from LSR_ROLE2COLL_NAMESPACE and LSR_ROLE2COLL_NAME]
    D --> E[Cleanup after collection conversion]

    E --> F[Remove coll_dir/.ansible]
    E --> G[Remove .tox/ansible-plugin-scan]
    E --> H[Remove coll_dir/.collection to satisfy ansible-lint v26]

    F --> I[Create coll_dir/.git directory]
    G --> I
    H --> I

    I --> J[Run ansible-lint action on cleaned collection]
    J --> K[End job]
Loading

File-Level Changes

Change Details Files
Extend CI cleanup step in ansible-lint workflow to remove the .collection directory from the converted collection.
  • Adjust the post-conversion cleanup command to delete the .collection directory in the converted collection directory.
  • Preserve existing cleanup of the .ansible directory and ansible-plugin-scan artifacts.
  • Keep the subsequent creation of a temporary .git directory in the collection directory unchanged.
.github/workflows/ansible-lint.yml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@richm richm merged commit 6be1f1d into main Feb 4, 2026
14 checks passed
@richm richm deleted the remove-dot-collection-dir branch February 4, 2026 21: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.

1 participant