fix(e2e): skip ValidateScriptlessPhase3 when CustomCATrustCerts is set#9013
Closed
mxj220 wants to merge 1 commit into
Closed
fix(e2e): skip ValidateScriptlessPhase3 when CustomCATrustCerts is set#9013mxj220 wants to merge 1 commit into
mxj220 wants to merge 1 commit into
Conversation
mxj220
requested review from
AbelHu,
Devinwong,
SriHarsha001,
awesomenix,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
karenychen,
lilypan26,
pdamianov-dev,
phealy,
r2k1,
runzhen,
sulixu,
timmy-wright,
titilambert,
xuexu6666 and
zachary-bailey
as code owners
July 22, 2026 17:16
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the e2e validation suite to skip ValidateScriptlessPhase3 when CustomCATrustCerts are configured, aligning behavior with the existing skip in ValidateScriptlessNBCCSECmd and preventing failures in scenarios that set custom CA trust.
Changes:
- Add a guard to
ValidateScriptlessPhase3to skip the env-var diff validation whenCustomCATrustCertsare present. - Refactor the condition to use a local
nbc := s.Runtime.NBCfor readability.
Comment on lines
+2773
to
+2775
| nbc := s.Runtime.NBC | ||
| if s.Runtime.AKSNodeConfig != nil && nbc.EnableScriptlessNBCCSECmd && | ||
| (nbc.CustomCATrustConfig == nil || len(nbc.CustomCATrustConfig.CustomCATrustCerts) == 0) { |
cameronmeissner
approved these changes
Jul 22, 2026
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.
What this PR does / why we need it:
skip ValidateScriptlessPhase3 when CustomCATrustCerts is set
PR #8995 added this skip to the sibling ValidateScriptlessNBCCSECmd but
missed ValidateScriptlessPhase3, causing Test_Ubuntu2204 and
Test_AzureLinuxV3 (both set CustomCATrustCerts) to fail
Which issue(s) this PR fixes:
Fixes #