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

machinectl: include the success command #5287

Merged
merged 1 commit into from
Sep 25, 2022
Merged

machinectl: include the success command #5287

merged 1 commit into from
Sep 25, 2022

Conversation

benjamb
Copy link
Contributor

@benjamb benjamb commented Sep 15, 2022

Combines the success command when building the become command. This is consistent with other become plugins.

SUMMARY

Was debugging an issue involving the combination of pipelining and running machinectl as sudo and came across this, though this is not the cause it seemed prudent to submit a PR for it.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

machinectl

ADDITIONAL INFORMATION

@ansibullbot
Copy link
Collaborator

cc @None
click here for bot help

@ansibullbot ansibullbot added become become plugin bug This issue/PR relates to a bug new_contributor Help guide this first time contributor plugins plugin (any type) small_patch Hopefully easy to review needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Sep 15, 2022
@felixfontein
Copy link
Collaborator

Thanks for you contribution! Could you please add a changelog fragment? Thanks.

@ansibullbot ansibullbot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI and removed small_patch Hopefully easy to review needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI labels Sep 15, 2022
@benjamb
Copy link
Contributor Author

benjamb commented Sep 15, 2022

@felixfontein How's that? Opted for minor_changes rather than bugfixes as that felt a little more appropriate.

@benjamb
machinectl: include the success command
e91a8a3 
Combines the success command when building the become command. This is
consistent with other become plugins.
felixfontein
felixfontein approved these changes Sep 18, 2022
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Looks good to me. I have no way to test this, but assuming noone complains, I'll merge this in a week or so.

@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Sep 18, 2022
@felixfontein felixfontein merged commit f3bcfa5 into ansible-collections:main Sep 25, 2022
@patchback
Copy link

patchback bot commented Sep 25, 2022 •
edited
Loading

Backport to stable-4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply f3bcfa5 on top of patchback/backports/stable-4/f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9/pr-5287

Backporting merged PR #5287 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-4/f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9/pr-5287 upstream/stable-4
  4. Now, cherry-pick PR machinectl: include the success command #5287 contents into that branch: 
    $ git cherry-pick -x f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9
    If it'll yell at you with something like fatal: Commit f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR machinectl: include the success command #5287 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-4/f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9/pr-5287
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link

patchback bot commented Sep 25, 2022 •
edited
Loading

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/f3bcfa5a75ef93bb36e3e050d62261ff74a66cd9/pr-5287

Backported as #5312

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@benjamb thanks for your contribution!

patchback bot pushed a commit that referenced this pull request Sep 25, 2022
@benjamb @patchback
machinectl: include the success command (#5287)
e8bdb7c 
Combines the success command when building the become command. This is
consistent with other become plugins.

(cherry picked from commit f3bcfa5)
@patchback patchback bot mentioned this pull request Sep 25, 2022
Merged
@github-actions
Copy link

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

felixfontein pushed a commit that referenced this pull request Sep 28, 2022
@patchback @benjamb
machinectl: include the success command (#5287) (#5312)
8beb5d7 
Combines the success command when building the become command. This is
consistent with other become plugins.

(cherry picked from commit f3bcfa5)

Co-authored-by: Ben Brown <ben@demerara.io>
v1v added a commit to v1v/community.general that referenced this pull request Oct 7, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/support-logs
3d0c09d 
* upstream/main: (203 commits)
  Make pfexec become usable for illumos (ansible-collections#3889)
  znode: add options for authentication (ansible-collections#5306)
  keycloak_user_federation: add explanation and example to vendor option (ansible-collections#4893)
  Next expected release is 5.8.0.
  Allow terraform module to specify complex variable structures (ansible-collections#4797)
  Fix ansible-collections#5313: redhat_subscription module is not idempotent when pool_ids (ansible-collections#5319)
  bitwarden: Add field to search for all item attributes, instead of on… (ansible-collections#5297)
  New Module: Keycloak User Rolemapping (ansible-collections#4898)
  chore: Update lxc_container to support py3 (ansible-collections#5304)
  terraform: run `init` with no-color, too (ansible-collections#5147)
  nmcli: fix error when setting previously unset mac address (ansible-collections#5291)
  [feat] proxmox_snap: snapshot containers with configured mountpoints (ansible-collections#5274)
  machinectl: include the success command (ansible-collections#5287)
  Add SetSessionService to redfish_config (ansible-collections#5009)
  locale_gen: fix UbuntuMode (ansible-collections#5282)
  ini_file: fix lint error (ansible-collections#5307)
  netcup_dnsapi: Add timeout paramter (ansible-collections#5301)
  stable-2.14 is now default.
  Add stable-2.14 to CI, adjust to devel version bump (ansible-collections#5298)
  Try to run reuse workflow without explicitly allowing it for new contributors. (ansible-collections#5296)
  ...
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@benjamb
machinectl: include the success command (ansible-collections#5287)
5c5e63d 
Combines the success command when building the become command. This is
consistent with other become plugins.
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@benjamb
machinectl: include the success command (ansible-collections#5287)
fbf89ec 
Combines the success command when building the become command. This is
consistent with other become plugins.
@trux-bot trux-bot bot mentioned this pull request Nov 7, 2022
Merged
1 task
This was referenced Nov 20, 2022
Closed
Merged
Closed
Closed
Closed
Closed
Merged
Merged
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Open
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Dec 1, 2022
Open
Closed
@renovate renovate bot mentioned this pull request Dec 14, 2022
Closed
1 task
@renovate renovate bot mentioned this pull request Jan 1, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
become become plugin bug This issue/PR relates to a bug new_contributor Help guide this first time contributor plugins plugin (any type)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@benjamb @ansibullbot @felixfontein