tools: fix brpm script to use correct builddir in temp directory#6809
Merged
blackboxsw merged 3 commits intocanonical:mainfrom Mar 31, 2026
Merged
tools: fix brpm script to use correct builddir in temp directory#6809blackboxsw merged 3 commits intocanonical:mainfrom
blackboxsw merged 3 commits intocanonical:mainfrom
Conversation
blackboxsw
force-pushed
the
fix-rpm-builds
branch
2 times, most recently
from
d6eef19 to
d2131bb
Compare
holmanb
reviewed
Mar 30, 2026
| # Use the util functions from cloudinit | ||
| sys.path.insert(0, find_root()) | ||
| from cloudinit import subp, templater, util | ||
| from cloudinit import temp_utils |
Member
There was a problem hiding this comment.
Why is this not in the list on the next line up?
Why didn't static analysis catch this issue?
Collaborator
Author
There was a problem hiding this comment.
ruff didn't see python scripts which do not carry the suffix .py. I've added a supplemental commit to also include brpm, bddeb and read-dependencies.
RockyLinux 9 has Jinja 2.11. Template-based unit tests break due to unsupported closure: +%}. Revert portion of 473fa33 to retain skip decorator avoiding unit test when Jinja is < 3.0.0 to support rockylinux developer rpm builds.
blackboxsw
force-pushed
the
fix-rpm-builds
branch
from
259236e to
c432c72
Compare
blackboxsw
added a commit
to blackboxsw/cloud-init
that referenced
this pull request
Apr 13, 2026
…onical#6809) RockyLinux 9 has Jinja 2.11. Template-based unit tests break due to unsupported closure: +%}. Revert portion of 473fa33 to retain skip decorator avoiding unit test when Jinja is < 3.0.0 to support rockylinux developer rpm builds. Update ruff extra-includes to validate read-dependencies, bddeb and brpm.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Additionally, the tool
./tools/run-container --source-package --unittest --artifacts=./srpm/ rockylinux/9fails due to packages/brpm script not have appropriate importtemp_utilsand misuses a string "builddir" instead of the local variablebuilddir.Proposed Commit Message
Additional Context
Test Steps
Merge type