Skip to content

Conversation

@ranakan19
Copy link
Member

@ranakan19 ranakan19 commented Feb 5, 2026

Manually cherry pick #25724 as automation was failing with conflicts

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@ranakan19 ranakan19 marked this pull request as ready for review February 5, 2026 22:49
@ranakan19 ranakan19 requested a review from a team as a code owner February 5, 2026 22:49
@ranakan19
Copy link
Member Author

unable to change the PR title - if somebody has access, new title:

test(e2e): add isolation by ensuring unique name (cherry-pick #25724 for 3.3)

@ranakan19 ranakan19 marked this pull request as draft February 5, 2026 23:20
@ranakan19
Copy link
Member Author

ranakan19 commented Feb 5, 2026

Apologies for the noise,
The following PRs must be cherry-picked into the release branch prior to merging #25724 (basing this on their original merge order, relevant issue details and ci-failures on this PR):

Original PR Cherry-pick PR Status Notes
#25720 #26246 ✅ Merged Related to #24307
#25752 #26288 ✅ Merged
#25902 #26284 ✅ Merged
#25751 #26337 ✅ Merged
#25864 #26338 ✅ Merged
#25780 #26339 ✅ Merged Related to #24307
#25901 #26340 ✅ Merged
#25731 #26370 ✅ Merged Optional (Nice to have)

After above PRs are cherry-picked and merged, need to make the following changes on this PR to resolve conflicts and meet checks:

  1. fix PR name - i'm unable to change it now - need help rename it to test(e2e): add isolation by ensuring unique name (cherry-pick #25724 for 3.3) ✅ Done
  2. Remove e2e changes from 25537, as feature not included in 3.3 ✅ Done in b5649aa
  3. remove sync status check in e2e tests from 25692 as it is not in release 3.3 ✅ Done in 0867fea
  4. Cherry-pick fix(hydrator): Fix compilation error #26024 ✅ Done in c6f4b62

I have validated these in PR #26290, which aggregates all the cherry-picked commits and steps listed above, and the ci-build is green. (This was to test, and can be closed once this PR is merged)

post-merge requirements:
#26024 - (Cherry-pick: #26341): 🔍 Ready for Review. - Currently failing in ci due to dependency not a post merge requirement, 26341 and 26287 are dependent on one another. See point 4
And then progressive sync e2e tests cherry-pick PR should be green

@reggie-k reggie-k changed the title cherry-pick - test(e2e): add isolation by ensuring unique name (#25724) test(e2e): add isolation by ensuring unique name (cherry-pick #25724 for 3.3) Feb 11, 2026
@ranakan19 ranakan19 marked this pull request as ready for review February 11, 2026 12:45
Signed-off-by: Oliver Gondža <[email protected]>
Signed-off-by: Kanika Rana <[email protected]>
@codecov
Copy link

codecov bot commented Feb 11, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 62.64%. Comparing base (273683b) to head (4d40aaf).

Additional details and impacted files
@@               Coverage Diff               @@
##           release-3.3   #26287      +/-   ##
===============================================
- Coverage        62.66%   62.64%   -0.02%     
===============================================
  Files              353      353              
  Lines            50169    50169              
===============================================
- Hits             31437    31430       -7     
- Misses           15704    15711       +7     
  Partials          3028     3028              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Kanika Rana <[email protected]>
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