Skip to content

Fix bert-e waterfall#4964

Merged
bert-e merged 2 commits into
development/133.0from
bugfix/fix-waterfall
Jun 11, 2026
Merged

Fix bert-e waterfall#4964
bert-e merged 2 commits into
development/133.0from
bugfix/fix-waterfall

Conversation

@TeddyAndrieux

@TeddyAndrieux TeddyAndrieux commented Jun 11, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

g-carre and others added 2 commits May 19, 2026 17:07
@g-carre @claude
test: increase retry budgets for monitoring and CR waits (MK8S-261)
e6b36dc 
The kube-state-metrics Prometheus job and the generic wait_for_status
primitive have been hitting their retry budgets in pre-merge e2e jobs
on slower CI runners without any product-level regression — the
resources do become healthy, just past the existing timeout. Bump:

* tests/post/steps/test_monitoring.py: 30 -> 60 retries (90s -> 180s)
  for the Prometheus job-up wait. The comment above the call already
  notes kube-state-metrics can be slow to start.
* tests/kube_utils.py: 24 -> 48 retries (120s -> 240s) for the
  generic wait_for_status used by Volume and other CR tests, and
  align the inline comment.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@TeddyAndrieux
Merge branch 'improvement/MK8S-261-reduce-e2e-flakes' into bugfix/fix…
5bcc0df 
…-waterfall
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner June 11, 2026 15:26
@bert-e

bert-e commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e

bert-e commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@TeddyAndrieux

TeddyAndrieux commented Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

/approve

@bert-e

bert-e commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Integration data created

I have created the integration data for the additional destination branches.

  • this pull request will merge bugfix/fix-waterfall into
    development/133.0
  • w/134.0/bugfix/fix-waterfall will be merged into development/134.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.0
  • development/132.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e

bert-e commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@claude

claude Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

@TeddyAndrieux

TeddyAndrieux commented Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

/bypass_peer_approval

@bert-e

bert-e commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/133.0

  • ✔️ development/134.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.0
  • development/132.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

The following options are set: bypass_peer_approval, approve

@bert-e bert-e merged commit 5bcc0df into development/133.0 Jun 11, 2026
33 checks passed
@bert-e bert-e deleted the bugfix/fix-waterfall branch June 11, 2026 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@g-carre g-carre g-carre approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@TeddyAndrieux @bert-e @g-carre