fix: flaky tests in ab e2e#8983
Merged
Merged
Conversation
awesomenix
requested review from
AbelHu,
Devinwong,
SriHarsha001,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
karenychen,
lilypan26,
mxj220,
pdamianov-dev,
phealy,
r2k1,
runzhen,
sulixu,
surajssd,
timmy-wright,
titilambert,
xuexu6666 and
zachary-bailey
as code owners
July 18, 2026 00:54
awesomenix
enabled auto-merge (squash)
July 18, 2026 00:57
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to reduce flakiness in AgentBaker E2E by (a) relaxing/adjusting waagent log error matching for Ubuntu 22.04 FIPS scenarios and (b) adjusting E2E scenario inputs/expectations around custom CA trust and ServiceAccountImagePullProfile behavior.
Changes:
- Extend
ValidateWaagentLogfiltering for Ubuntu 22.04 FIPS to ignore an additional known ExtHandler error substring (CHAIN_ZERO). - Modify
Test_ACLby commenting out custom CA injection and related CA trust validations. - Add explicit “should-not-appear” sentinel values to the disabled ServiceAccountImagePullProfile configuration for Ubuntu 22.04 Gen2 identity binding tests.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
e2e/validators.go |
Adjusts waagent ExtHandler error scanning behavior for Ubuntu 22.04 FIPS scenarios. |
e2e/scenario_test.go |
Updates E2E scenarios for ACL custom CA trust and ServiceAccountImagePullProfile identity binding behavior. |
Comment on lines
+83
to
+87
| // nbc.CustomCATrustConfig = &datamodel.CustomCATrustConfig{ | ||
| // CustomCATrustCerts: []string{ | ||
| // encodedTestCert, | ||
| // }, | ||
| // } |
Comment on lines
+90
to
+92
| // config.CustomCaCerts = []string{ | ||
| // encodedTestCert, | ||
| // } |
Comment on lines
+100
to
+102
| // ValidateFileExists(ctx, s, "/etc/ssl/certs/ca-certificates.crt") | ||
| // // ACL uses Azure Linux CA trust paths under /etc (read-only /usr via dm-verity) | ||
| // ValidateNonEmptyDirectory(ctx, s, "/etc/pki/ca-trust/source/anchors") |
| grepCmd := fmt.Sprintf("sudo grep 'ERROR ExtHandler' %s || true", waagentLogFile) | ||
| if isUbuntu2204FIPS { | ||
| grepCmd = fmt.Sprintf("sudo grep 'ERROR ExtHandler' %s | grep -v 'Cannot convert PFX to PEM' || true", waagentLogFile) | ||
| grepCmd = fmt.Sprintf("sudo grep 'ERROR ExtHandler' %s | grep -v 'Cannot convert PFX to PEM' | grep -v 'CHAIN_ZERO' || true", waagentLogFile) |
djsly
approved these changes
Jul 18, 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.
fix 2 flaky tests