Skip to content

fix: restore factory validation baseline - #850

Merged
hanthor merged 4 commits into
mainfrom
fix/queue-baseline-20261031
Oct 31, 2026
Merged

hanthor merged 4 commits into
mainfrom
fix/queue-baseline-20261031

Conversation

@hanthor

@hanthor hanthor commented Oct 31, 2026 •

Copy link
Copy Markdown
Member

Fix

Land the validation/recovery helpers and the Rygel scriptlet boundary fix cleanly against current main (which now carries 681-recipe refreshed counts/backlog from #847 and #853):

  • Add just regenerate-inventory for Packit config, architecture counts and backlog state; keep just check read-only.
  • Update contributor and factory-backlog guidance to regenerate after combining current main and PR source changes, even when generated files auto-merge.
  • Add the missing %post header before %systemd_user_post in packages/rygel/rygel.spec (from stacked fix(rygel): install user-unit post scriptlet #851, merged into this branch) so user-unit preset handling belongs to the installed RPM's post-install scriptlet rather than %install.
  • Remove invalid tab whitespace from imported packages/powerstat/packit.yaml.
  • Remove the prohibited historical DELTA.md session artifact carrying committed conflict markers.

Fixes #849
Fixes #824

Verification

  • just check: 1410 passed, 2871 subtests passed; all configuration/runtime/backlog gates passed.
  • just regenerate-inventory run twice: .packit.yaml, docs/architecture.md and reports/factory-build-backlog.json remained byte-identical.
  • Actual binary-header queries in the repository-pinned Packit image: original Rygel POSTIN was (none); repaired Rygel POSTIN contains install-user-units rygel.service.

No package build, publication or runtime availability is claimed. No protection, approval or check is bypassed.

Refresh architecture and backlog state from the current inventory. Add one inventory regeneration command, repair invalid imported YAML whitespace, and preserve workflow output values with grouped redirection.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: contributor-lane:workflow-path

@hivecommons-hive

Copy link
Copy Markdown
Contributor
1de0568

ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blocked

Hive flagged this PR (author @hanthor, head 1de056863e04) because it matches behaviors that can override security controls, escalate privileges or damage the codebase. This is a heuristic, not an accusation — a maintainer should confirm the change is intended before it merges.

  • sensitive_path — changes 2 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • .github/workflows/rebuild-rpms.yml
    • Justfile

Hive did not add the sentinel-alert label because this author is trusted. The finding remains recorded for audit and the dashboard Security tab; set sentinel.trusted_authors_block: true to require the blocking label for trusted authors too.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@hanthor this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (1 waiting): fixes are handed out before new work as soon as you have capacity.

Regenerate combined 680-recipe architecture and backlog state after #847 landed on main, and remove the prohibited historical DELTA session artifact carrying committed conflict markers.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: contributor-lane:workflow-path

@hivecommons-hive hivecommons-hive Bot 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.

Summary: This pull request set out to fix a stale package count that was making the project's own test suite fail. That count has since been corrected on the main branch by another change, so what remains here is useful housekeeping: a one-step command to refresh generated files, matching guidance updates, removal of a leftover scratch file, and two small cleanups. The description still describes the original count fix, which no longer appears in the change — it should be reworded so reviewers know what they are merging.

What I need from you: @hanthor, update the title/body to match the current diff (suggested wording below).


Reviewed at head c9452ec (the PR moved on from 1de0568; merge-base with main is 2bc425c).

intent-alignment

  • PR body describes a regeneration that is no longer in the diff (medium, in-scope). The body says it regenerates docs/architecture.md and reports/factory-build-backlog.json from a 679-recipe inventory (167/347/37; 159 pending). Against current main the diff touches only .github/workflows/rebuild-rpms.yml, DELTA.md, Justfile, docs/contributing.md, docs/skills/factory-build-backlog.md, packages/powerstat/packit.yaml — neither generated file changes. On main 2bc425c (after #847) tests/test_architecture_counts.py already passes (7 passed) and tools/factory_build_backlog.py --check reports "consistent (166 entries, 158 pending)", so the numbers in the body are stale and #849's defect is already fixed upstream (and #849 itself says to close without a PR in that case). The rest of the diff — Justfile:41-46 recipe, docs rewrites, DELTA.md deletion (it carried committed conflict markers at DELTA.md:1 and :127), the powerstat tab fix, the GITHUB_OUTPUT grouping at rebuild-rpms.yml:429-433 — is reasonable follow-on work but not what #849 asks for. Suggested body opening:
    -Restore the package factory's validation baseline without weakening any gate:
    -
    -- Regenerate architecture counts and backlog snapshot from the current 679-recipe inventory (167 backlog / 347 resolved / 37 wontfix; 159 pending).
    +The stale architecture counts from #849 were regenerated on main by #847. This PR adds the recovery tooling and guidance so the drift does not recur, plus small inherited cleanups:
    +
    and change Fixes #849 to Closes #849 (already fixed on main by #847) or drop it and close the issue by hand.

docs-currency

  • Other skill docs still cite the raw generator commands (low, out-of-scope). docs/skills/font-package-recipes.md:113-114 and docs/skills/repeated-mistakes.md:577,590,600 still tell contributors to run render_packit_config.py --write / render_architecture_counts.py --write directly while docs/contributing.md and docs/skills/factory-build-backlog.md now point at just regenerate-inventory. The commands remain valid, so nothing is wrong today; worth a follow-up sweep.

No findings from: correctness, security, style.

Confidence: 3/5 (needs attention) — 1 medium finding; 1 perspective requested changes

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

Place the inherited systemd user-unit preset macro in a post-install section rather than the build install script. Preserve the local boundary fix on future Rawhide imports.

Assisted-by: GPT-6.1 via GitHub Copilot

Signed-off-by: James Reilly <jreilly1821@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: contributor-lane:workflow-path

Main now carries refreshed 681-recipe counts/backlog from #853. Drop the optional SC2129 style edit in rebuild-rpms.yml so this PR touches no pipeline paths and passes Canary immediately while landing just regenerate-inventory, the Rygel %post fix (#824), powerstat YAML fix, and prohibited DELTA.md cleanup.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@hanthor
hanthor merged commit a590886 into main Oct 31, 2026
21 checks passed

@hivecommons-hive hivecommons-hive Bot 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.

Summary: This change adds a one-step "rebuild the generated inventory" command and the guidance to use it, and fixes a small packaging mistake in the rygel media server recipe. The code looks correct, but the pull request description still advertises two changes that are no longer in it (regenerated package counts and a workflow tidy-up) and says nothing about the rygel fix that is. Please bring the description in line with what the branch actually changes.

What I need from you: Update the PR description as suggested below.


Reviewed at head aa72fe12 (the PR moved past 25d65d3d while this review ran; the delta since the previous hive review at 1de05686 was read in full).

intent-alignment

  • PR body describes changes the diff no longer contains, and omits one it does (in-scope, still present from the previous review, now wider).

    • "Regenerate architecture counts and backlog snapshot from the current 679-recipe inventory (167 backlog / 347 resolved / 37 wontfix; 159 pending)": gh pr diff 850 touches neither docs/architecture.md nor reports/factory-build-backlog.json. Those files at head read 681 recipes (docs/architecture.md:133-144) and backlog 165 / resolved 349 / wontfix 37 / pending 157 (reports/factory-build-backlog.json totals/states), all inherited from main (#847, #853), not produced by this PR.
    • "Group the rebuild workflow's three GITHUB_OUTPUT writes" and the "Grouped-output shell smoke" verification bullet: commit aa72fe12 ("drop non-CI workflow style edit") removed .github/workflows/rebuild-rpms.yml from the diff.
    • The diff does add a %post header to packages/rygel/rygel.spec:79 (from #851) and the matching paragraph in docs/skills/factory-build-backlog.md:1074-1080, which the body never mentions. That fix is outside #849's scope but is small, correct, and author-owned, so it is fine to keep — just say so.

    Suggested replacement for the body's "Fix" and "Verification" sections:

     ## Fix
    
     Restore the package factory's validation baseline without weakening any gate:
    
    -- Regenerate architecture counts and backlog snapshot from the current 679-recipe inventory (167 backlog / 347 resolved / 37 wontfix; 159 pending).
     - Add `just regenerate-inventory` for Packit config, architecture counts and backlog state; keep `just check` read-only.
     - Update contributor and factory-backlog guidance to regenerate after combining current main and PR source changes, even when generated files auto-merge.
     - Remove invalid tab whitespace from imported Powerstat Packit YAML.
    -- Group the rebuild workflow's three `GITHUB_OUTPUT` writes without changing values, permissions, signing, sources or publication behavior.
    +- Delete the stale, conflict-marked `DELTA.md` scratch file.
    +- rygel: add the missing `%post` header so `%systemd_user_post` runs as an install scriptlet instead of inside `%install` (#851), and record that in the backlog skill.
    +
    +The architecture counts and backlog snapshot already match the 681-recipe inventory on `main` (#847, #853); this PR adds the command and guidance that keep them from drifting again.
    
     Fixes #849
    
     ## Verification
    
     - `just check`: all configuration/runtime/backlog gates passed.
     - `pre-commit run --all-files`: passed after repairing the two inherited hook failures.
     - Ran `just regenerate-inventory` twice: `.packit.yaml`, `docs/architecture.md` and `reports/factory-build-backlog.json` remained byte-identical.
    -- Grouped-output shell smoke: resolved and empty cases both retain exactly `image`, `signer_ref`, and `seed` values.

No findings from: correctness, security, style, docs-currency.

Confidence: 3/5 (needs attention) — 1 perspective requested changes

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

hanthor added a commit that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to mrbobbytables/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to kylerankin/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to kylerankin/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to kylerankin/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to Karibhou/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to mendezr/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to mrbobbytables/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to thatguywob/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit to thatguywob/utah-packages that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
hanthor added a commit that referenced this pull request Oct 31, 2026
Merge current main (a590886) preserving all PR recipes and source locks, and regenerate combined inventory with just regenerate-inventory.

Assisted-by: GPT-6.1 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

1 participant