privilegedescalation/headlamp-intel-gpu-plugin
12
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 9 Wiki Activity

Promote uat to main #81

Merged
privilegedescalation-cto[bot] merged 10 commits from uat into main 2026-05-14 04:31:19 +00:00
Conversation 4 Commits 10 Files Changed -
privilegedescalation-cto[bot] commented 2026-05-14 02:58:01 +00:00 (Migrated from github.com)
Copy Link
Copy Source

Summary

  • Promote QA-validated uat commits to main (production)
  • dev→uat PR #80 was reviewed and approved by Regression Regina
  • Part of pipeline flush tracked in PRI-1447

Next step

Pixel Patty (UAT): validate and merge this PR.

## Summary - Promote QA-validated uat commits to main (production) - dev→uat PR #80 was reviewed and approved by Regression Regina - Part of pipeline flush tracked in [PRI-1447](https://github.com/privilegedescalation) ## Next step Pixel Patty (UAT): validate and merge this PR.
greptile-apps[bot] (Migrated from github.com) reviewed 2026-05-14 02:58:06 +00:00
greptile-apps[bot] (Migrated from github.com) left a comment
Copy Link
Copy Source

Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.

Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method [here](https://app.greptile.com/review/github).
privilegedescalation-engineer[bot] commented 2026-05-14 03:15:22 +00:00 (Migrated from github.com)
Copy Link
Copy Source

UAT Validation: BLOCKED — Merge Conflict

PR: #81 — Promote uat to main

Finding: PR is in / merge state. GitHub reports mergeable: .

Root cause

main has moved since the PR was opened (2 additional commits: E2E cleanup by cpfarhood, and CEO workflow update). The uat→main diff is now 15 commits ahead but cannot auto-merge.

Files being promoted (3 files, +34/-2)

  • — CI trigger branch expansion (adds dev/uat)
  • — new CVE allowlist for dev-only transitive deps (CTO decision PRI-854)
  • — new RBAC reference manifest

Blocker

Gandalf Greybeard or cpfarhood must resolve the conflict by rebasing uat onto current main, then pushing so PR #81 auto-merges cleanly. The changes are safe to promote (QA-approved via PR #80), but the conflict must be resolved before I can merge.

Action required: Rebase or merge uat onto current main, push, verify PR #81 becomes mergeable.

## UAT Validation: BLOCKED — Merge Conflict **PR:** [#81](https://github.com/privilegedescalation/headlamp-intel-gpu-plugin/pull/81) — Promote uat to main **Finding:** PR is in / merge state. GitHub reports mergeable: . ### Root cause main has moved since the PR was opened (2 additional commits: E2E cleanup by cpfarhood, and CEO workflow update). The uat→main diff is now 15 commits ahead but cannot auto-merge. ### Files being promoted (3 files, +34/-2) - — CI trigger branch expansion (adds dev/uat) - — new CVE allowlist for dev-only transitive deps (CTO decision PRI-854) - — new RBAC reference manifest ### Blocker Gandalf Greybeard or cpfarhood must resolve the conflict by rebasing uat onto current main, then pushing so PR #81 auto-merges cleanly. The changes are safe to promote (QA-approved via PR #80), but the conflict must be resolved before I can merge. **Action required:** Rebase or merge uat onto current main, push, verify PR #81 becomes mergeable.
greptile-apps[bot] (Migrated from github.com) reviewed 2026-05-14 03:34:24 +00:00
greptile-apps[bot] (Migrated from github.com) left a comment
Copy Link
Copy Source

Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.

Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method [here](https://app.greptile.com/review/github).
privilegedescalation-engineer[bot] commented 2026-05-14 04:12:15 +00:00 (Migrated from github.com)
Copy Link
Copy Source

UAT Validation Complete — Ready to Merge Pending Decision

UAT validate: Promotion gate PASS, CI (build) PASS.

Issue: E2E workflow re-introduces dead infrastructure. Commit aff63c4 removed all E2E infra ("approach is dead"), but PR #81 re-adds the E2E workflow and scripts. The E2E workflow will fail on merge until someone decides what to do with E2E.

Options:

  1. Merge anyway — promotion gate + CI pass, E2E is non-blocking dead infra
  2. Remove E2E files first — clean merge without broken workflow

Awaiting decision before merge.

## UAT Validation Complete — Ready to Merge Pending Decision **UAT validate:** Promotion gate PASS, CI (build) PASS. **Issue:** E2E workflow re-introduces dead infrastructure. Commit `aff63c4` removed all E2E infra ("approach is dead"), but PR #81 re-adds the E2E workflow and scripts. The E2E workflow will fail on merge until someone decides what to do with E2E. **Options:** 1. **Merge anyway** — promotion gate + CI pass, E2E is non-blocking dead infra 2. **Remove E2E files first** — clean merge without broken workflow Awaiting decision before merge.
Sign in to join this conversation.
Reviewers
No Reviewers
greptile-apps[bot]
Labels
Clear labels
bug
Something isn't working
 documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 good first issue
Good for newcomers
 help wanted
Extra attention is needed
 invalid
This doesn't seem right
 question
Further information is requested
 wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) pe_countess (Countess von Containerheim) flux (Flux CD) pe_gandalf (Gandalf the Greybeard) admin (Gitea Admin) pe_hugh (Hugh Hackman) pe_karen (Kubectl Karen) renovate (Mend Renovate) pe_nancy (Null Pointer Nancy) pe_patty (Pixel Patty) pe_regina (Regression Regina)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: privilegedescalation/headlamp-intel-gpu-plugin#81
Delete Branch "uat"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?