Skip to content

CTM-659: add retries for eventual consistency - #495

Merged
davidangb merged 2 commits into
masterfrom
da/CTM-659_integration_test_stability
Oct 13, 2026
Merged

davidangb merged 2 commits into
masterfrom
da/CTM-659_integration_test_stability

Conversation

@davidangb

@davidangb davidangb commented Oct 8, 2026 •

Copy link
Copy Markdown
Collaborator

CTM-659

Three changes in this PR:

  1. Disable the testCreateGoogleProject_createsConsumerOverride integration test. This test is consistently failing. It fails at the step where RBS tries to set BigQuery quota on the project it just created. This is working correctly in dev and prod; it seems to be a problem with the test environment setup, but I have not determined the root cause. The test failure is blocking release of some security updates (see CTM-659: bump TCL, which bumps bouncycastle #494). I suggest we disable the test to get the security updates out and verify in the live environments it continues to work post-release.
  2. Add a retry to one step of GoogleProjectCreationFlight - all steps had a retry except this one.
  3. Add retries to test assertions in CreateProjectFlightIntegrationTest

The latter two changes are aimed to make integration tests less flaky. Because RBS integration tests typically take about 1 hour, any flakiness is very painful.

addStep(
new CreateConsumerDefinedQuotaForBigQueryDailyUsageStep(serviceUsageCow, gcpProjectConfig));
new CreateConsumerDefinedQuotaForBigQueryDailyUsageStep(serviceUsageCow, gcpProjectConfig),
newCloudApiDefaultRetryRule());

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only step in the flight that didn't have the retry rule. Adding it.

// IAM policy changes may not be visible immediately, so poll until they are.
awaitEventualConsistency()
.untilAsserted(
() -> {

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this diff is easier to see if you hide whitespace!

@sonarqubecloud

sonarqubecloud Bot commented Oct 9, 2026

Copy link
Copy Markdown

@davidangb
davidangb marked this pull request as ready for review October 13, 2026 12:45
@davidangb
davidangb requested a review from a team as a code owner October 13, 2026 12:45
@davidangb
davidangb requested review from THWiseman, aednichols, jgainerdewar and marctalbott and removed request for a team October 13, 2026 12:45
@davidangb
davidangb merged commit 08b214d into master Oct 13, 2026
6 checks passed
@davidangb
davidangb deleted the da/CTM-659_integration_test_stability branch October 13, 2026 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants