Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Bump containerd to v1.6.4 and pause to 3.7 #3778

Merged
merged 3 commits into from
Jun 1, 2022
Merged

build: Bump containerd to v1.6.4 and pause to 3.7 #3778

merged 3 commits into from
Jun 1, 2022

Conversation

gdemonet
Copy link
Contributor

@gdemonet gdemonet requested a review from a team as a code owner May 25, 2022 08:03
@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

Hello gdemonet,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

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:

@gdemonet gdemonet added topic:build Anything related to building steps kind:dependencies Pull requests that update a dependency file labels May 25, 2022
TeddyAndrieux
TeddyAndrieux previously approved these changes May 25, 2022
View reviewed changes
packages/redhat/common/containerd.spec
@@ -58,7 +58,7 @@ Requires: runc

# vendored libraries
# From github.com/containerd/containerd repository, checkout the corresponding version and run:
# go list -m -f '{{ if not .Main }}{{.Path }} {{ .Version }}{{ end }}' -u all 2> /dev/null \
# go list -m -mod=mod -f '{{ if not .Main }}{{.Path }} {{ .Version }}{{ end }}' -u all 2> /dev/null \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@gdemonet gdemonet force-pushed the improvement/bump-containerd-and-pause branch 2 times, most recently from 29ab831 to 797f80c Compare May 25, 2022 08:42
@gdemonet gdemonet force-pushed the improvement/bump-containerd-and-pause branch from 797f80c to 5e8000b Compare May 31, 2022 06:27
@gdemonet
ci: Increase timeout to 40mn for a doit build
dbfc19d 
It happens sometimes that for some unknown reason, downloading very
large files (such as Calico RPM sources) will hang for a long time, and
Eve kills the build after 20mn without output. We raise this timeout to
40mn, to see if that helps.
@gdemonet
Copy link
Contributor Author

gdemonet commented Jun 1, 2022

/approve

@bert-e
Copy link
Contributor

bert-e commented Jun 1, 2022

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:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 1, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • 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

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 1, 2022

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

  • ✔️ development/123.0

The following branches have NOT changed:

  • 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 gdemonet.

@bert-e bert-e merged commit 5cd6dee into development/123.0 Jun 1, 2022
@bert-e bert-e deleted the improvement/bump-containerd-and-pause branch June 1, 2022 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

Assignees
No one assigned
Labels
kind:dependencies Pull requests that update a dependency file topic:build Anything related to building steps
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gdemonet @bert-e @TeddyAndrieux