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

scaleway_organization_info: sanity checks #5571

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Nov 17, 2022

SUMMARY

Fix sanity checks.

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

plugins/modules/scaleway_organization_info.py

@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added cloud docs module module plugins plugin (any type) tests tests labels Nov 17, 2022
@github-actions
Copy link

github-actions bot commented Nov 17, 2022

Docs Build 📝

Thank you for contribution!✨

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

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Nov 17, 2022
Co-authored-by: Felix Fontein <felix@fontein.de>
@felixfontein felixfontein merged commit 83ff442 into ansible-collections:main Nov 17, 2022
@patchback
Copy link

patchback bot commented Nov 17, 2022

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

❌ Failed to cleanly apply 83ff442 on top of patchback/backports/stable-5/83ff4429e887c89edfb7f6c494d2a755fd75a3fd/pr-5571

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

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 17, 2022
@patchback
Copy link

patchback bot commented Nov 17, 2022

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/83ff4429e887c89edfb7f6c494d2a755fd75a3fd/pr-5571

Backported as #5577

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

@felixfontein
Copy link
Collaborator

@russoz thanks!

patchback bot pushed a commit that referenced this pull request Nov 17, 2022
* scaleway_organization_info: fix sanity checks

* remove lines from ignore files

* Update plugins/modules/scaleway_organization_info.py

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 83ff442)
@russoz russoz deleted the scaleway-org-info-sanity branch November 17, 2022 06:21
felixfontein pushed a commit that referenced this pull request Nov 17, 2022
* scaleway_organization_info: fix sanity checks

* remove lines from ignore files

* Update plugins/modules/scaleway_organization_info.py

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 83ff442)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
* scaleway_organization_info: fix sanity checks

* remove lines from ignore files

* Update plugins/modules/scaleway_organization_info.py

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
* scaleway_organization_info: fix sanity checks

* remove lines from ignore files

* Update plugins/modules/scaleway_organization_info.py

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cloud docs module module plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants