Skip to content

ansible: drop obsolete osism-fqcn noqa on blocks#2899

Merged
berendt merged 1 commit into
mainfrom
cleanup-osism-fqcn-noqa
Jun 1, 2026
Merged

ansible: drop obsolete osism-fqcn noqa on blocks#2899
berendt merged 1 commit into
mainfrom
cleanup-osism-fqcn-noqa

Conversation

@ideaship

@ideaship ideaship commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Removes two now-unnecessary # noqa: osism-fqcn annotations on block
constructs in the manager playbooks.

The custom osism-fqcn ansible-lint rule previously emitted spurious
violations on block/rescue/always constructs, so these annotations
were added as a workaround. osism/container-images#902 fixes the rule to
correctly skip these constructs, and the updated ansible-lint image has
been published (and is consumed as :latest by the Zuul lint job), so the
suppressions are no longer needed.

Both suppressions sat on genuine block false-positives:

  • ansible/manager-part-0.yml — "Debian/Ubuntu specific tasks" block
  • ansible/manager-part-3.yml — "Try to apply the manager role" block

Note: osism/issues#1368 listed manager-part-1.yml, but that file has no
osism-fqcn annotation. The actual second annotation lives in
manager-part-3.yml (written as # noqa osism-fqcn, without the colon).
The issue checklist has been corrected accordingly.

Related-Bug: #1368

The custom osism-fqcn ansible-lint rule used to emit spurious
violations on block/rescue/always constructs, so two manager
playbooks carried `# noqa: osism-fqcn` annotations as a workaround.

container-images#902 fixes the rule to correctly skip these
constructs, and the updated ansible-lint image has been published,
so the annotations are no longer needed. Both suppressions sat on
genuine block false-positives and removing them keeps CI green:

- ansible/manager-part-0.yml: "Debian/Ubuntu specific tasks" block
- ansible/manager-part-3.yml: "Try to apply the manager role" block

Related-Bug: #1368
AI-assisted: Claude Code
Signed-off-by: Roger Luethi <luethi@osism.tech>
@ideaship ideaship marked this pull request as ready for review June 1, 2026 09:35
@ideaship ideaship moved this from Ready to In review in Human Board Jun 1, 2026

@janhorstmann janhorstmann 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.

LGTM

@berendt berendt merged commit 36b98c1 into main Jun 1, 2026
3 checks passed
@berendt berendt deleted the cleanup-osism-fqcn-noqa branch June 1, 2026 11:30
@github-project-automation github-project-automation Bot moved this from In review to Done in Human Board Jun 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants