Skip to content

build: Pin pip version to 21.1.3 in Salt master image#4831

Merged
bert-e merged 1 commit intodevelopment/132.0from
bugfix/MK8S-198-avoid-not-trace-attribute
Mar 20, 2026
Merged

build: Pin pip version to 21.1.3 in Salt master image#4831
bert-e merged 1 commit intodevelopment/132.0from
bugfix/MK8S-198-avoid-not-trace-attribute

Conversation

@TeddyAndrieux
Copy link
Copy Markdown
Collaborator

This is a workaround to avoid issues with the VerboseLogger class from pip in version superior to 21.2 that conflicts with Salt logger.

Fixes: MK8S-198

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner March 20, 2026 16:41
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

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.

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
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/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
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@TeddyAndrieux
Copy link
Copy Markdown
Collaborator Author

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.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

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

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Waiting for approval

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

  • the author

  • 2 peers

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

The following options are set: create_integration_branches

This is a workaround to avoid issues with the `VerboseLogger` class
from pip in version superior to 21.2 that conflicts with Salt logger.

Fixes: MK8S-198
@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/MK8S-198-avoid-not-trace-attribute branch from 05da2e3 to ebce6b8 Compare March 20, 2026 16:42
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

History mismatch

Merge commit #05da2e34c20ebfcd25cebe6b403d802fcecfc80c on the integration branch
w/133.0/bugfix/MK8S-198-avoid-not-trace-attribute is merging a branch which is neither the current
branch bugfix/MK8S-198-avoid-not-trace-attribute nor the development branch
development/133.0.

It is likely due to a rebase of the branch bugfix/MK8S-198-avoid-not-trace-attribute 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.

The following options are set: create_integration_branches

@TeddyAndrieux
Copy link
Copy Markdown
Collaborator Author

/reset

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Reset complete

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

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.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

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

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Waiting for approval

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

  • the author

  • 2 peers

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

The following options are set: create_integration_branches

gcarre20
gcarre20 previously approved these changes Mar 20, 2026
@TeddyAndrieux
Copy link
Copy Markdown
Collaborator Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

Build failed

The build for commit did not succeed in branch w/133.0/bugfix/MK8S-198-avoid-not-trace-attribute

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 20, 2026

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

  • ✔️ development/132.0

  • ✔️ development/133.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/129.0
  • development/130.0
  • development/131.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 MK8S-198.

Goodbye teddyandrieux.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit ebce6b8 into development/132.0 Mar 20, 2026
30 checks passed
@bert-e bert-e deleted the bugfix/MK8S-198-avoid-not-trace-attribute branch March 20, 2026 22:26
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.

5 participants