metalk8s icon indicating copy to clipboard operation
metalk8s copied to clipboard

build, pkgs: Bump containerd to 1.6.36 and pause to 3.10

Open eg-ayoub opened this issue 1 year ago • 3 comments

eg-ayoub avatar Oct 18 '24 09:10 eg-ayoub

Hello eg-ayoub,

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 :star:
/bypass_build_status Bypass the build and test status :star:
/bypass_commit_size Bypass the check on the size of the changeset TBA :star:
/bypass_incompatible_branch Bypass the check on the source branch prefix :star:
/bypass_jira_check Bypass the Jira issue check :star:
/bypass_peer_approval Bypass the pull request peers' approval :star:
/bypass_leader_approval Bypass the pull request leaders' approval :star:
/approve Instruct Bert-E that the author has approved the pull request. :writing_hand:
/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 avatar Oct 18 '24 09:10 bert-e

Waiting for approval

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

  • the author

  • one peer

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

  • @teddyandrieux

  • @chengyanjin

  • @thomasdanan

  • @aprucolimartins

  • @eg-ayoub

  • @xaf-scality

  • @m4nch0t

  • @jbwatenbergscality

  • @ezekiel-alexrod

bert-e avatar Oct 18 '24 09:10 bert-e

Waiting for approval

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

  • the author

  • one peer

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

  • @eg-ayoub

  • @aprucolimartins

  • @xaf-scality

  • @thomasdanan

  • @ezekiel-alexrod

  • @teddyandrieux

  • @jbwatenbergscality

  • @m4nch0t

  • @chengyanjin

bert-e avatar Oct 18 '24 12:10 bert-e

Conflict

There is a conflict between your branch improvement/bump-containerd-1.6.36 and the destination branch development/129.0.

Please resolve the conflict on the feature branch (improvement/bump-containerd-1.6.36).

git fetch && \
git checkout origin/improvement/bump-containerd-1.6.36 && \
git merge origin/development/129.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/bump-containerd-1.6.36

bert-e avatar Nov 07 '24 09:11 bert-e

Waiting for approval

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

  • the author

  • one peer

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

  • @m4nch0t

  • @chengyanjin

  • @teddyandrieux

  • @jbwatenbergscality

  • @thomasdanan

  • @ezekiel-alexrod

  • @xaf-scality

  • @eg-ayoub

  • @aprucolimartins

bert-e avatar Nov 15 '24 14:11 bert-e

/approve

eg-ayoub avatar Nov 15 '24 14:11 eg-ayoub

Waiting for approval

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

  • the author

  • one peer

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

  • @m4nch0t

  • @chengyanjin

  • @teddyandrieux

  • @jbwatenbergscality

  • @thomasdanan

  • @ezekiel-alexrod

  • @xaf-scality

  • @eg-ayoub

  • @aprucolimartins

The following options are set: approve

bert-e avatar Nov 15 '24 14:11 bert-e

Build failed

The build for commit did not succeed in branch improvement/bump-containerd-1.6.36.

The following options are set: approve

bert-e avatar Nov 15 '24 15:11 bert-e

Waiting for approval

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

  • the author

  • one peer

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

  • @jbwatenbergscality

  • @m4nch0t

  • @teddyandrieux

  • @ezekiel-alexrod

  • @aprucolimartins

  • @thomasdanan

  • @xaf-scality

  • @eg-ayoub

  • @chengyanjin

The following options are set: approve

bert-e avatar Nov 18 '24 15:11 bert-e

/approve

eg-ayoub avatar Nov 18 '24 16:11 eg-ayoub

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

  • :heavy_check_mark: development/129.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/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 eg-ayoub.

The following options are set: approve

bert-e avatar Nov 18 '24 17:11 bert-e

clic

m4nch0t avatar Nov 19 '24 08:11 m4nch0t