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.

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

packages: Make our sosreport package compatible with new sos version #3664

Conversation

TeddyAndrieux
Copy link
Collaborator

Since sos layout changed in 4.0 and CentOS 7 does not have this sos
version available by default, so we need some logic in the packages
in order to be compatible with sos > 4.0 and sos < 4.0.

We enforce sos < 4.0 for CentOS/RHEL 7 and sos >= 4.0 for RHEL8

Fixes: #3387

@TeddyAndrieux TeddyAndrieux requested a review from a team January 14, 2022 10:40
@bert-e
Copy link
Contributor

bert-e commented Jan 14, 2022

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jan 14, 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.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 Jan 14, 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:

Since sos layout changed in 4.0 and CentOS 7 does not have this sos
version available by default, so we need some logic in the packages
in order to be compatible with sos > 4.0 and sos < 4.0.

We enforce sos < 4.0 for CentOS/RHEL 7 and sos >= 4.0 for RHEL8

Fixes: #3387
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/make-sos-report-compatible-with-uptodate-sos branch from 14fdfaa to 06fa3a7 Compare January 14, 2022 10:40
@bert-e
Copy link
Contributor

bert-e commented Jan 14, 2022

History mismatch

Merge commit #14fdfaa6ffa6a9157d0c841058cdd64d2d005d04 on the integration branch
w/123.0/improvement/make-sos-report-compatible-with-uptodate-sos is merging a branch which is neither the current
branch improvement/make-sos-report-compatible-with-uptodate-sos nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/make-sos-report-compatible-with-uptodate-sos 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
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 14, 2022

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Jan 14, 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.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 Jan 14, 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:

Copy link
Contributor

@alexandre-allard alexandre-allard left a comment

Choose a reason for hiding this comment

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

LGTM

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 14, 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/2.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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 Jan 14, 2022

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

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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.

@bert-e bert-e merged commit 06fa3a7 into development/2.11 Jan 14, 2022
@bert-e bert-e deleted the improvement/make-sos-report-compatible-with-uptodate-sos branch January 14, 2022 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

metalk8s-sosreport package is not compatible with latest sos 4.0.0+ versions
3 participants