fix(pipelines): declare shellIdentity on dev-ci ci-bot-secret Shell steps (AROSLSRE-1380)#5890
Merged
openshift-merge-bot[bot] merged 1 commit intoJul 2, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR makes ARO-HCP pipeline YAMLs schema-compliant by ensuring all remaining Shell steps declare a shellIdentity, preventing EV2RA manifest-generation failures caused by missing shell identity variables.
Changes:
- Add
shellIdentityto thefixesShell step inmgmt-solo-pipeline.yaml, sourcingglobalMSIIdfrom the existingglobal/outputstep. - Add a new
outputOnlyglobal-identityARM step in the dev-ci E2E subscription RBAC pipeline to surfaceglobalMSIId. - Wire
shellIdentityfor theci-bot-secret-{int,stg,prod}Shell steps to the newglobal-identitystep output.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| dev-infrastructure/mgmt-solo-pipeline.yaml | Adds missing shellIdentity to the remaining Shell step (fixes) using the existing globalMSIId output chain. |
| dev-infrastructure/dev-ci/e2e-subscription-rbac/pipeline.yaml | Introduces an output-only identity lookup step and updates Shell steps to reference it for shellIdentity. |
…teps Every Shell step's shellIdentity is effectively mandatory: sdp-pipelines EV2RA manifest generation validates it unconditionally. ARO-HCP CI does not run that generation, so Shell steps missing shellIdentity slip through and only fail the bump after merge (as happened in Azure#5834). Declare shellIdentity on the dev-ci offenders so the repo is fully compliant ahead of making shellIdentity required in the ARO-Tools pipeline schema (AROSLSRE-1380): - dev-ci/e2e-subscription-rbac 'ci-bot-secret-{int,stg,prod}': reference a new outputOnly 'global-identity' step (output-opstool-global-identity.bicep, which already existed with its bicepparam) to expose globalMSIId. shellIdentity is only consumed by EV2; templatize's local executor ignores it, so dev/CI behaviour is unchanged. The swift-vnet and mgmt-solo 'fixes' Shell steps are handled in the reland PR Azure#5889, which already edits both mgmt pipeline files. Validated with 'templatize pipeline validate' against topology-dev-ci.yaml. AROSLSRE-1380
raelga
force-pushed
the
rael/harden-shellidentity-AROSLSRE-1380
branch
from
74fae53 to
b0cd5ef
Compare
raelga
changed the title
8 tasks
Merged
8 tasks
Collaborator
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: geoberle, raelga 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 |
raelga
added a commit
to raelga/ARO-HCP
that referenced
this pull request
Jul 3, 2026
…SLSRE-1380) Bumps the github.com/Azure/ARO-Tools modules from 2277df76598b (2026-06-17) to 4612291d5420 (2026-07-03), which makes shellIdentity a required field on shellStepBase in the pipeline schema (Azure/ARO-Tools#262). This lands the enforcement so that a Shell step missing shellIdentity now fails ARO-HCP 'make validate-config-pipelines' at PR time, instead of only breaking the sdp-pipelines EV2 bump after merge (the regression that hit ARO-28045 / Azure#5834). All in-repo pipelines validate cleanly against the stricter schema; the known offenders were already fixed in Azure#5889 and Azure#5890.
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
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.
AROSLSRE-1380
What
Declare
shellIdentityon the dev-ciShellsteps that omit it:ci-bot-secret-{int,stg,prod}indev-infrastructure/dev-ci/e2e-subscription-rbac/pipeline.yaml→ reference a newoutputOnlyglobal-identitystep (using the already-presentoutput-opstool-global-identity.bicep+ its bicepparam) to exposeglobalMSIId.The
swift-vnetandmgmt-solo-pipeline.yamlfixesShell steps are handled in the reland PR #5889 (which already edits both mgmt pipeline files). Together with this PR, every Shell step in the repo declaresshellIdentity.Why
A
Shellstep'sshellIdentityis effectively mandatory — sdp-pipelines EV2RA manifest generation validates it unconditionally:ARO-HCP CI never runs that generation, so a Shell step missing
shellIdentitypasses all checks and only breaks the bump after merge (as happened with #5834, ARO-28045). This PR makes the dev-ci pipeline compliant so AROSLSRE-1380 can makeshellIdentityrequiredin the ARO-Tools pipeline schema and catch this class of bug at PR time.shellIdentityis consumed only by EV2; templatize's local executor ignores it, so dev/CI runtime behaviour is unchanged.Testing
yamllint -c .yamllint.yml(clean).templatize pipeline validateagainsttopology-dev-ci.yaml— passes, confirming the newglobal-identityoutput step and theshellIdentityinput chains resolve.Special notes for your reviewer
global-identityisoutputOnly: true— it deploys nothing, it only surfaces the existing global MSI's resource ID (viaexistinglookup) so the dev-ci Shell steps can reference it.PR Checklist