Work around JENKINS-73034 and JENKINS-73168 #1547
Merged
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.
Work around JENKINS-73034 and JENKINS-73168 to stabilize the test suite; those two tickets track the long-term fix. Once this is merged and the weekly line is green again, I will file two additional ATH tickets to remove these workarounds, blocked on JENKINS-73034 and JENKINS-73168 respectively.
Testing done
CI build of weekly line
Fixes #1544, fixes #1545