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

[Part #3] Ensures the modules documentation follows the correct formats #2082

Conversation

alinabuzachis
Copy link
Contributor

SUMMARY
ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Feature Pull Request
  • New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

Copy link

github-actions bot commented May 10, 2024

Docs Build 📝

Thank you for contribution!✨

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

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/3b63a4395cb34df6a5cd86ec0d22bffd

✔️ ansible-galaxy-importer SUCCESS in 5m 16s
✔️ build-ansible-collection SUCCESS in 15m 33s
✔️ ansible-test-splitter SUCCESS in 7m 03s
✔️ integration-amazon.aws-1 SUCCESS in 18m 14s
✔️ integration-amazon.aws-2 SUCCESS in 12m 59s
✔️ integration-amazon.aws-3 SUCCESS in 19m 54s
✔️ integration-amazon.aws-4 SUCCESS in 8m 29s
✔️ integration-amazon.aws-5 SUCCESS in 6m 48s
✔️ integration-amazon.aws-6 SUCCESS in 6m 26s
✔️ integration-amazon.aws-7 SUCCESS in 8m 15s
✔️ integration-amazon.aws-8 SUCCESS in 6m 37s
Skipped 36 jobs

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/42f387a058ec4876b63fbd356f59f22b

✔️ ansible-galaxy-importer SUCCESS in 5m 35s
✔️ build-ansible-collection SUCCESS in 17m 18s
✔️ ansible-test-splitter SUCCESS in 6m 24s
✔️ integration-amazon.aws-1 SUCCESS in 22m 48s
✔️ integration-amazon.aws-2 SUCCESS in 16m 05s
✔️ integration-amazon.aws-3 SUCCESS in 23m 19s
✔️ integration-amazon.aws-4 SUCCESS in 13m 31s
✔️ integration-amazon.aws-5 SUCCESS in 6m 30s
✔️ integration-amazon.aws-6 SUCCESS in 8m 17s
✔️ integration-amazon.aws-7 SUCCESS in 11m 38s
✔️ integration-amazon.aws-8 SUCCESS in 9m 53s
✔️ integration-community.aws-1 SUCCESS in 18m 29s
✔️ integration-community.aws-2 SUCCESS in 6m 48s
Skipped 34 jobs

Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible-collections/amazon.aws for 2082,8a35e794e70772c9be9d116404d55ee0eb91d12e

Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible-collections/amazon.aws for 2082,b670c4957db1f5ef5ce1862ea52f92078fb2321c

Copy link
Contributor

@tremble tremble left a comment

Choose a reason for hiding this comment

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

Some minor suggestions, not blockers.

plugins/modules/ec2_vpc_endpoint.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_igw_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_igw_info.py Outdated Show resolved Hide resolved
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/eb98fefec15c4db6879602806cfd7b03

✔️ ansible-galaxy-importer SUCCESS in 11m 21s
✔️ build-ansible-collection SUCCESS in 19m 02s
✔️ ansible-test-splitter SUCCESS in 8m 56s
✔️ integration-amazon.aws-1 SUCCESS in 19m 22s
✔️ integration-amazon.aws-2 SUCCESS in 14m 00s
✔️ integration-amazon.aws-3 SUCCESS in 21m 04s
✔️ integration-amazon.aws-4 SUCCESS in 10m 14s
✔️ integration-amazon.aws-5 SUCCESS in 9m 11s
✔️ integration-amazon.aws-6 SUCCESS in 8m 52s
✔️ integration-amazon.aws-7 SUCCESS in 9m 01s
✔️ integration-amazon.aws-8 SUCCESS in 7m 35s
Skipped 36 jobs

plugins/modules/ec2_vpc_net_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_net_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_route_table_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_subnet_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_subnet_info.py Outdated Show resolved Hide resolved
@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label May 23, 2024
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/93a8d9b2f9144f57b1b45555c80b543e

✔️ ansible-galaxy-importer SUCCESS in 5m 25s
✔️ build-ansible-collection SUCCESS in 18m 42s
✔️ ansible-test-splitter SUCCESS in 8m 08s
✔️ integration-amazon.aws-1 SUCCESS in 19m 38s
integration-amazon.aws-2 RETRY_LIMIT in 1m 42s
✔️ integration-amazon.aws-3 SUCCESS in 18m 51s
✔️ integration-amazon.aws-4 SUCCESS in 9m 05s
✔️ integration-amazon.aws-5 SUCCESS in 6m 27s
✔️ integration-amazon.aws-6 SUCCESS in 7m 49s
✔️ integration-amazon.aws-7 SUCCESS in 8m 07s
✔️ integration-amazon.aws-8 SUCCESS in 6m 09s
Skipped 36 jobs

@tremble
Copy link
Contributor

tremble commented May 23, 2024

regate

Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/20adc7fd3a3d4ef9be9fed197a992698

✔️ ansible-galaxy-importer SUCCESS in 4m 05s
✔️ build-ansible-collection SUCCESS in 16m 15s
✔️ ansible-test-splitter SUCCESS in 7m 42s
✔️ integration-amazon.aws-1 SUCCESS in 18m 16s
✔️ integration-amazon.aws-2 SUCCESS in 15m 32s
✔️ integration-amazon.aws-3 SUCCESS in 19m 01s
✔️ integration-amazon.aws-4 SUCCESS in 8m 37s
✔️ integration-amazon.aws-5 SUCCESS in 6m 28s
✔️ integration-amazon.aws-6 SUCCESS in 7m 54s
✔️ integration-amazon.aws-7 SUCCESS in 8m 07s
✔️ integration-amazon.aws-8 SUCCESS in 8m 46s
Skipped 36 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit b47d1cf into ansible-collections:main May 23, 2024
36 of 37 checks passed
alinabuzachis added a commit to alinabuzachis/amazon.aws that referenced this pull request Jun 26, 2024
…ts (ansible-collections#2082)

[Part #3] Ensures the modules documentation follows the correct formats

SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
@tremble tremble added the backport-8 PR should be backported to the stable-8 branch label Aug 27, 2024
Copy link

patchback bot commented Aug 27, 2024

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

❌ Failed to cleanly apply b47d1cf on top of patchback/backports/stable-8/b47d1cffde53d3576d40d705d003214c6deeb06b/pr-2082

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

@tremble tremble added the backport_failed Backport failed, needs review label Aug 27, 2024
Copy link

patchback bot commented Aug 27, 2024

Backport to stable-failed: 💔 cherry-picking failed — target branch does not exist

❌ Failed to find branch stable-failed

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

@tremble tremble removed the backport-8 PR should be backported to the stable-8 branch label Aug 27, 2024
@tremble tremble added the backport-8 PR should be backported to the stable-8 branch label Aug 27, 2024
Copy link

patchback bot commented Aug 27, 2024

Backport to stable-8: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-8/b47d1cffde53d3576d40d705d003214c6deeb06b/pr-2082

Backported as #2247

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

patchback bot pushed a commit that referenced this pull request Aug 27, 2024
…ts (#2082)

[Part #3] Ensures the modules documentation follows the correct formats

SUMMARY

ISSUE TYPE

Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
(cherry picked from commit b47d1cf)
@tremble tremble removed the backport_failed Backport failed, needs review label Aug 27, 2024
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Aug 28, 2024
…ts (#2082) (#2247)

This is a backport of PR #2082 as merged into main (b47d1cf).
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8 PR should be backported to the stable-8 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants