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

salt: Add the grains_cache option to Salt minions #4311

Merged
merged 1 commit into from
Apr 16, 2024
Merged

salt: Add the grains_cache option to Salt minions #4311

merged 1 commit into from
Apr 16, 2024

Conversation

ezekiel-alexrod
Copy link
Contributor

Force the sync of the custom set grains. Relates to saltstack/salt#54331

@ezekiel-alexrod ezekiel-alexrod requested a review from a team as a code owner April 12, 2024 13:12
@bert-e
Copy link
Contributor

bert-e commented Apr 12, 2024

Hello ezekiel-alexrod,

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
Contributor

bert-e commented Apr 12, 2024

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:

@ezekiel-alexrod ezekiel-alexrod force-pushed the feature/add-grains-cache-option branch from 1468f73 to 845a054 Compare April 12, 2024 13:38
@ezekiel-alexrod ezekiel-alexrod changed the base branch from development/128.0 to development/127.0 April 12, 2024 13:38
@bert-e
Copy link
Contributor

bert-e commented Apr 12, 2024

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.

@ezekiel-alexrod
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Apr 12, 2024

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/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
Contributor

bert-e commented Apr 12, 2024

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: create_integration_branches

@ezekiel-alexrod ezekiel-alexrod force-pushed the feature/add-grains-cache-option branch from 845a054 to 3d55242 Compare April 15, 2024 09:42
@bert-e

This comment was marked as resolved.

Sign in to view
@ezekiel-alexrod ezekiel-alexrod force-pushed the feature/add-grains-cache-option branch from 3d55242 to 5d0e3f4 Compare April 15, 2024 09:47
@ezekiel-alexrod
Copy link
Contributor Author

/reset

@bert-e

This comment was marked as resolved.

Sign in to view
@bert-e

This comment was marked as resolved.

Sign in to view
@bert-e
Copy link
Contributor

bert-e commented Apr 15, 2024

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: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Apr 15, 2024

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: create_integration_branches

TeddyAndrieux
TeddyAndrieux reviewed Apr 15, 2024
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.

If you may just add a changelog entry and then LGTM

@ezekiel-alexrod ezekiel-alexrod force-pushed the feature/add-grains-cache-option branch from 5d0e3f4 to a3a325f Compare April 16, 2024 09:43
@bert-e

This comment was marked as resolved.

Sign in to view
@ezekiel-alexrod ezekiel-alexrod force-pushed the feature/add-grains-cache-option branch from a3a325f to 8f88910 Compare April 16, 2024 09:43
@ezekiel-alexrod
Copy link
Contributor Author

/reset

@bert-e

This comment was marked as resolved.

Sign in to view
@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2024

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/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
Contributor

bert-e commented Apr 16, 2024

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: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2024

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: create_integration_branches

@ezekiel-alexrod
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2024

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

  • ✔️ development/127.0

  • ✔️ development/128.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.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 None.

Goodbye ezekiel-alexrod.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 8f88910 into development/127.0 Apr 16, 2024
26 checks passed
@bert-e bert-e deleted the feature/add-grains-cache-option branch April 16, 2024 12:26
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
@ezekiel-alexrod @bert-e @TeddyAndrieux