search

scality / metalk8s

An opinionated Kubernetes distribution with a focus on long-term on-prem deployments
Apache License 2.0
363 stars 45 forks source link

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

Closed eg-ayoub closed 1 week ago

bert-e commented 1 month ago

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 commented 1 month ago

Waiting for approval

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

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

bert-e commented 1 month ago

Waiting for approval

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

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

bert-e commented 2 weeks ago

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 commented 1 week ago

Waiting for approval

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

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

eg-ayoub commented 1 week ago

/approve

bert-e commented 1 week ago

Waiting for approval

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

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

The following options are set: approve

bert-e commented 1 week ago

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 commented 1 week ago

Waiting for approval

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

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

The following options are set: approve

eg-ayoub commented 1 week ago

/approve

bert-e commented 1 week ago

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

The following branches have NOT changed:

Please check the status of the associated issue None.

Goodbye eg-ayoub.

The following options are set: approve

m4nch0t commented 1 week ago

clic