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

ec2_asg_lifecycle_hook: Add check_mode support #1060

Merged
merged 2 commits into from
Apr 13, 2022
Merged

ec2_asg_lifecycle_hook: Add check_mode support #1060

merged 2 commits into from
Apr 13, 2022

Conversation

mandar242
Copy link
Contributor

SUMMARY

Add check_mode support to ec2_asg_lifecycle_hook.

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

ec2_asg_lifecycle_hook

@ansibullbot
Copy link

cc @jillr @markuman @s-hertel @tremble @tsiganenok
click here for bot help

@ansibullbot ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration module module needs_triage plugins plugin (any type) tests tests labels Apr 12, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

markuman
markuman requested changes Apr 13, 2022
View reviewed changes
Copy link
Member

@markuman markuman left a comment

Choose a reason for hiding this comment

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

A changelog fragment is missong. otherwise lgtm.

@markuman markuman added the backport-3 PR should be backported to the stable-3 branch label Apr 13, 2022
@mandar242
Copy link
Contributor Author

A changelog fragment is missong. otherwise lgtm.

@markuman, Thank you! Added.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

jatorcasso
jatorcasso approved these changes Apr 13, 2022
View reviewed changes
Copy link
Contributor

@jatorcasso jatorcasso left a comment

Choose a reason for hiding this comment

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

LGTM!

@mandar242 mandar242 added the mergeit Merge the PR (SoftwareFactory) label Apr 13, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 1d2605b into ansible-collections:main Apr 13, 2022
@patchback
Copy link

patchback bot commented Apr 13, 2022 •
edited
Loading

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

❌ Failed to cleanly apply 1d2605b on top of patchback/backports/stable-3/1d2605b1a2898fa4e7175f6c5848ff849c533586/pr-1060

Backporting merged PR #1060 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.aws.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-3/1d2605b1a2898fa4e7175f6c5848ff849c533586/pr-1060 upstream/stable-3
  4. Now, cherry-pick PR ec2_asg_lifecycle_hook: Add check_mode support #1060 contents into that branch: 
    $ git cherry-pick -x 1d2605b1a2898fa4e7175f6c5848ff849c533586
    If it'll yell at you with something like fatal: Commit 1d2605b1a2898fa4e7175f6c5848ff849c533586 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x 1d2605b1a2898fa4e7175f6c5848ff849c533586
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ec2_asg_lifecycle_hook: Add check_mode support #1060 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-3/1d2605b1a2898fa4e7175f6c5848ff849c533586/pr-1060
  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.

@renovate renovate bot mentioned this pull request Jun 24, 2022
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markuman markuman markuman approved these changes

@jatorcasso jatorcasso jatorcasso approved these changes

Assignees
No one assigned
Labels
backport-3 PR should be backported to the stable-3 branch community_review feature This issue/PR relates to a feature request integration tests/integration mergeit Merge the PR (SoftwareFactory) module module plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mandar242 @ansibullbot @markuman @jatorcasso