fix(aro-hcp): pin prod-rh e2e jobs to RH-tenant subscriptions - #82461
Conversation
The PROD e2e jobs that run against the RH tenant (VAULT_SECRET_PROFILE:
prod-rh) mount only the RH-tenant cluster profile dir
(/var/run/aro-hcp-prod-rh) but set no ALLOWED_SUBSCRIPTIONS. As a result
slot-manager acquire could lease the MSFT Test-Tenant sub ("ARO HCP E2E")
from the prod pool, and the acquire step's VerifyCustomerSubscriptionName
then fails with:
no customer subscription name file matched slot subscription "..." in
/var/run/aro-hcp-prod-rh
because the Test-Tenant sub's credentials are not mounted for these jobs.
Constrain ALLOWED_SUBSCRIPTIONS to the two RH-tenant prod subs on all six
affected jobs (presubmits prod-e2e-parallel, -ocp-stable, -ocp-fast,
-ocp-nightly and periodics prod-e2e-parallel, -ocp-nightly), all of which
run aro-hcp-persistent-e2e -> aro-hcp-lease-acquire. The cross-tenant
delete-expired-prod-00/01 cleanup jobs are unaffected (fixed
CUSTOMER_SUBSCRIPTION, no slot lease).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
WalkthroughProduction ARO-HCP E2E job configurations now set ChangesARO-HCP production subscription restrictions
Estimated code review effort: 1 (Trivial) | ~5 minutes Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
@roivaz: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: raelga, roivaz The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/pj-rehearse ack |
|
@roivaz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Why
The PROD ARO-HCP e2e jobs that run against the RH tenant (
VAULT_SECRET_PROFILE: prod-rh) mount only the RH-tenant cluster profile dir (/var/run/aro-hcp-prod-rh) but set noALLOWED_SUBSCRIPTIONS. Since STG/PROD were migrated to the slot-manager leasing model and the prod pool now spans two tenants,slot-manager acquirecould lease the MSFT Test-Tenant sub (ARO HCP E2E) from the prod pool. The acquire step'sVerifyCustomerSubscriptionNamethen fails intermittently with:because the Test-Tenant credentials are not mounted for these RH-only jobs.
What
Constrain
ALLOWED_SUBSCRIPTIONSto the two RH-tenant prod subs on all six affected jobs (all runaro-hcp-persistent-e2e→aro-hcp-lease-acquire):Azure-ARO-HCP-main.yaml):prod-e2e-parallel,-ocp-stable,-ocp-fast,-ocp-nightlyAzure-ARO-HCP-main__periodic.yaml):prod-e2e-parallel,-ocp-nightlyThe acquire step already prefers this allowlist (
--allowed-subscriptions), so the Test-Tenant sub is no longer handed out to RH-only jobs.The cross-tenant
delete-expired-prod-00/01-resource-groupscleanup jobs are unaffected — they target a fixedCUSTOMER_SUBSCRIPTIONviaaro-hcp-deprovision-expired-resource-groupsand do not lease a slot.Summary by CodeRabbit
Restricts six production ARO-HCP e2e jobs—four presubmit and two periodic—to the two RH-tenant production subscriptions. This prevents slot-manager from leasing the MSFT Test-Tenant subscription for jobs that only mount RH-tenant credentials, avoiding intermittent subscription verification failures.
Cross-tenant cleanup jobs are unaffected, and configuration validation and job generation checks pass without generated-job changes.