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,packages: Restrict runc version #3846

Merged
merged 2 commits into from
Aug 5, 2022
Merged

build,packages: Restrict runc version #3846

merged 2 commits into from
Aug 5, 2022

Conversation

gdemonet
Copy link
Contributor

@gdemonet gdemonet commented Aug 5, 2022 •
edited
Loading

The runc version 1.1.3, recently added in upstream repositories for
RHEL/Rocky 8, seems to include a bug causing issues with "exec" in
containers.
We explicitly reject this version in the RPM Requires line, hoping
that future versions will have this issue fixed.

See: containerd/containerd#7219

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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

This comment was marked as outdated.

Sign in to view
@gdemonet gdemonet force-pushed the bugfix/prevent-runc-1.1.3 branch 4 times, most recently from 733f86a to 4e0ac85 Compare August 5, 2022 08:15
@gdemonet gdemonet changed the base branch from development/124.0 to development/123.0 August 5, 2022 08:15
@gdemonet gdemonet marked this pull request as ready for review August 5, 2022 08:15
@gdemonet gdemonet requested a review from a team as a code owner August 5, 2022 08:15
@bert-e

This comment was marked as outdated.

Sign in to view
@bert-e

This comment was marked as outdated.

Sign in to view
@bert-e

This comment was marked as resolved.

Sign in to view
@gdemonet
build,packages: Restrict runc version
c63b32c 
The runc version 1.1.3, recently added in upstream repositories for
RHEL/Rocky 8, seems to include a bug causing issues with "exec" in
containers.
We explicitly reject this version in the RPM `Requires` line, hoping
that future versions will have this issue fixed.

See: containerd/containerd#7219
@gdemonet
Copy link
Contributor Author

gdemonet commented Aug 5, 2022

/reset

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2022

Integration data created

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

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

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

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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:

TeddyAndrieux
TeddyAndrieux previously approved these changes Aug 5, 2022
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

LGTM

@gdemonet
salt: Do not explicitly install runc
c3221a9 
This package is already required by containerd, and we don't need it
otherwise.
@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2022

History mismatch

Merge commit #bb3d0b7f5890347b3b81ba1236e409200bb9d995 on the integration branch
w/124.0/bugfix/prevent-runc-1.1.3 is merging a branch which is neither the current
branch bugfix/prevent-runc-1.1.3 nor the development branch
development/124.0.

It is likely due to a rebase of the branch bugfix/prevent-runc-1.1.3 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux
TeddyAndrieux approved these changes Aug 5, 2022
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

LGTM - again 😄

@TeddyAndrieux
Copy link
Collaborator

/reset

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2022

Integration data created

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

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

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

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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
Copy link
Contributor Author

gdemonet commented Aug 5, 2022

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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

  • ✔️ development/124.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 Aug 5, 2022

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

  • ✔️ development/123.0

  • ✔️ development/124.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 c3221a9 into development/123.0 Aug 5, 2022
@bert-e bert-e deleted the bugfix/prevent-runc-1.1.3 branch August 5, 2022 12:59
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
None yet
Projects
None yet
Milestone
No milestone
Development

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