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

Fix version_added #1484

Merged
merged 3 commits into from
May 4, 2023
Merged

Conversation

alinabuzachis
Copy link
Collaborator

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

Signed-off-by: Alina Buzachis <[email protected]>
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.

Do we want to make this PR dependent on the backports merging?

@github-actions
Copy link

github-actions bot commented Apr 27, 2023

Docs Build 📝

Thank you for contribution!✨

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

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/daec4b08f0da4bd6a857b7e14916abe0

✔️ ansible-galaxy-importer SUCCESS in 3m 44s
✔️ build-ansible-collection SUCCESS in 13m 36s
✔️ ansible-test-splitter SUCCESS in 5m 05s
✔️ integration-amazon.aws-1 SUCCESS in 16m 34s
✔️ integration-amazon.aws-2 SUCCESS in 7m 40s
✔️ integration-amazon.aws-3 SUCCESS in 9m 02s
✔️ integration-amazon.aws-4 SUCCESS in 9m 54s
integration-amazon.aws-5 FAILURE in 15m 35s
✔️ integration-amazon.aws-6 SUCCESS in 8m 38s
✔️ integration-amazon.aws-7 SUCCESS in 7m 25s
✔️ integration-amazon.aws-8 SUCCESS in 9m 07s
✔️ integration-amazon.aws-9 SUCCESS in 8m 36s
✔️ integration-amazon.aws-10 SUCCESS in 17m 11s
✔️ integration-amazon.aws-11 SUCCESS in 11m 16s
✔️ integration-amazon.aws-12 SUCCESS in 10m 47s
integration-amazon.aws-13 FAILURE in 6m 30s
Skipped 31 jobs

@tremble tremble added this to the 6.0.0 milestone Apr 27, 2023
Signed-off-by: Alina Buzachis <[email protected]>
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/b03fc68037ba4425a567a350d1bafa83

✔️ ansible-galaxy-importer SUCCESS in 5m 34s
✔️ build-ansible-collection SUCCESS in 13m 02s
✔️ ansible-test-splitter SUCCESS in 4m 50s
✔️ integration-amazon.aws-1 SUCCESS in 16m 47s
✔️ integration-amazon.aws-2 SUCCESS in 7m 56s
✔️ integration-amazon.aws-3 SUCCESS in 11m 18s
✔️ integration-amazon.aws-4 SUCCESS in 8m 26s
integration-amazon.aws-5 FAILURE in 15m 26s
✔️ integration-amazon.aws-6 SUCCESS in 8m 28s
✔️ integration-amazon.aws-7 SUCCESS in 7m 19s
✔️ integration-amazon.aws-8 SUCCESS in 8m 08s
✔️ integration-amazon.aws-9 SUCCESS in 9m 50s
✔️ integration-amazon.aws-10 SUCCESS in 20m 07s
✔️ integration-amazon.aws-11 SUCCESS in 14m 53s
✔️ integration-amazon.aws-12 SUCCESS in 13m 20s
integration-amazon.aws-13 FAILURE in 9m 15s
✔️ integration-amazon.aws-14 SUCCESS in 9m 17s
integration-community.aws-1 TIMED_OUT in 1h 00m 32s
✔️ integration-community.aws-2 SUCCESS in 22m 39s
✔️ integration-community.aws-3 SUCCESS in 7m 28s
✔️ integration-community.aws-4 SUCCESS in 45m 43s
✔️ integration-community.aws-5 SUCCESS in 56m 26s
✔️ integration-community.aws-6 SUCCESS in 23m 50s
✔️ integration-community.aws-7 SUCCESS in 28m 09s
✔️ integration-community.aws-8 SUCCESS in 20m 08s
✔️ integration-community.aws-9 SUCCESS in 34m 44s
✔️ integration-community.aws-10 SUCCESS in 22m 57s
✔️ integration-community.aws-11 SUCCESS in 31m 40s
✔️ integration-community.aws-12 SUCCESS in 26m 01s
✔️ integration-community.aws-13 SUCCESS in 22m 55s
✔️ integration-community.aws-14 SUCCESS in 48m 12s
✔️ integration-community.aws-15 SUCCESS in 15m 23s
✔️ integration-community.aws-16 SUCCESS in 44m 42s
✔️ integration-community.aws-17 SUCCESS in 11m 40s
✔️ integration-community.aws-18 SUCCESS in 12m 16s
✔️ integration-community.aws-19 SUCCESS in 19m 05s
✔️ integration-community.aws-20 SUCCESS in 11m 14s
Skipped 10 jobs

@alinabuzachis
Copy link
Collaborator Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 02s
✔️ build-ansible-collection SUCCESS in 12m 44s
✔️ ansible-test-splitter SUCCESS in 5m 04s
✔️ integration-amazon.aws-1 SUCCESS in 19m 20s
✔️ integration-amazon.aws-2 SUCCESS in 10m 11s
✔️ integration-amazon.aws-3 SUCCESS in 10m 35s
✔️ integration-amazon.aws-4 SUCCESS in 10m 09s
✔️ integration-amazon.aws-5 SUCCESS in 16m 27s
✔️ integration-amazon.aws-6 SUCCESS in 9m 57s
✔️ integration-amazon.aws-7 SUCCESS in 10m 03s
✔️ integration-amazon.aws-8 SUCCESS in 11m 28s
✔️ integration-amazon.aws-9 SUCCESS in 12m 37s
✔️ integration-amazon.aws-10 SUCCESS in 20m 13s
✔️ integration-amazon.aws-11 SUCCESS in 14m 31s
✔️ integration-amazon.aws-12 SUCCESS in 13m 38s
✔️ integration-amazon.aws-13 SUCCESS in 9m 19s
Skipped 31 jobs

@alinabuzachis alinabuzachis added the backport-5 PR should be backported to the stable-5 branch label May 4, 2023
@alinabuzachis
Copy link
Collaborator Author

@tremble Are we good merging it now?

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label May 4, 2023
@softwarefactory-project-zuul
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/aa082e95f55a4307a4ebdd83a0d83b7c

✔️ ansible-galaxy-importer SUCCESS in 4m 06s
✔️ build-ansible-collection SUCCESS in 15m 43s
✔️ ansible-test-splitter SUCCESS in 4m 46s
integration-amazon.aws-1 POST_FAILURE in 19m 09s
✔️ integration-amazon.aws-2 SUCCESS in 10m 30s
✔️ integration-amazon.aws-3 SUCCESS in 12m 22s
✔️ integration-amazon.aws-4 SUCCESS in 9m 41s
✔️ integration-amazon.aws-5 SUCCESS in 17m 27s
✔️ integration-amazon.aws-6 SUCCESS in 8m 54s
✔️ integration-amazon.aws-7 SUCCESS in 7m 54s
✔️ integration-amazon.aws-8 SUCCESS in 8m 25s
✔️ integration-amazon.aws-9 SUCCESS in 8m 55s
✔️ integration-amazon.aws-10 SUCCESS in 18m 15s
✔️ integration-amazon.aws-11 SUCCESS in 14m 50s
✔️ integration-amazon.aws-12 SUCCESS in 18m 12s
✔️ integration-amazon.aws-13 SUCCESS in 10m 29s
Skipped 31 jobs

@tremble
Copy link
Contributor

tremble commented May 4, 2023

regate

@softwarefactory-project-zuul
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/c43496fa8f9b42058b928624bde47c84

✔️ ansible-galaxy-importer SUCCESS in 4m 28s
✔️ build-ansible-collection SUCCESS in 13m 56s
✔️ ansible-test-splitter SUCCESS in 5m 02s
✔️ integration-amazon.aws-1 SUCCESS in 26m 51s
✔️ integration-amazon.aws-2 SUCCESS in 10m 58s
✔️ integration-amazon.aws-3 SUCCESS in 9m 59s
✔️ integration-amazon.aws-4 SUCCESS in 8m 51s
✔️ integration-amazon.aws-5 SUCCESS in 25m 59s
✔️ integration-amazon.aws-6 SUCCESS in 11m 07s
✔️ integration-amazon.aws-7 SUCCESS in 19m 28s
✔️ integration-amazon.aws-8 SUCCESS in 11m 10s
✔️ integration-amazon.aws-9 SUCCESS in 10m 01s
✔️ integration-amazon.aws-10 SUCCESS in 17m 31s
integration-amazon.aws-11 RETRY_LIMIT in 1m 34s
✔️ integration-amazon.aws-12 SUCCESS in 13m 36s
✔️ integration-amazon.aws-13 SUCCESS in 16m 49s
Skipped 31 jobs

@alinabuzachis
Copy link
Collaborator Author

regate

@softwarefactory-project-zuul
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/6750f654ed1d47db92e5806c91a3e320

✔️ ansible-galaxy-importer SUCCESS in 4m 12s
✔️ build-ansible-collection SUCCESS in 14m 19s
✔️ ansible-test-splitter SUCCESS in 6m 08s
✔️ integration-amazon.aws-1 SUCCESS in 20m 51s
✔️ integration-amazon.aws-2 SUCCESS in 9m 42s
✔️ integration-amazon.aws-3 SUCCESS in 9m 36s
integration-amazon.aws-4 RETRY_LIMIT in 1m 34s
✔️ integration-amazon.aws-5 SUCCESS in 19m 44s
✔️ integration-amazon.aws-6 SUCCESS in 8m 38s
✔️ integration-amazon.aws-7 SUCCESS in 9m 19s
✔️ integration-amazon.aws-8 SUCCESS in 9m 28s
✔️ integration-amazon.aws-9 SUCCESS in 11m 34s
✔️ integration-amazon.aws-10 SUCCESS in 22m 18s
✔️ integration-amazon.aws-11 SUCCESS in 11m 46s
integration-amazon.aws-12 RETRY_LIMIT in 1m 36s
✔️ integration-amazon.aws-13 SUCCESS in 6m 44s
Skipped 31 jobs

@alinabuzachis
Copy link
Collaborator Author

regate

@alinabuzachis
Copy link
Collaborator Author

regate

Copy link
Collaborator

@jillr jillr left a comment

Choose a reason for hiding this comment

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

manually merging

@jillr jillr merged commit 1f51ad4 into ansible-collections:main May 4, 2023
@patchback
Copy link

patchback bot commented May 4, 2023

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

❌ Failed to cleanly apply 1f51ad4 on top of patchback/backports/stable-5/1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9/pr-1484

Backporting merged PR #1484 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-5/1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9/pr-1484 upstream/stable-5
  4. Now, cherry-pick PR Fix version_added #1484 contents into that branch:
    $ git cherry-pick -x 1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9
    If it'll yell at you with something like fatal: Commit 1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix version_added #1484 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/1f51ad4ecf2720306c040c3e6ea69b7c4bb490b9/pr-1484
  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 added a commit to tremble/amazon.aws that referenced this pull request May 4, 2023
* Fix version_added

Signed-off-by: Alina Buzachis <[email protected]>

* Update

Signed-off-by: Alina Buzachis <[email protected]>

* Not backported

---------

Signed-off-by: Alina Buzachis <[email protected]>
Co-authored-by: Mark Chappell <[email protected]>
tremble added a commit that referenced this pull request May 4, 2023
Manual backport of #1484

SUMMARY

Fix version_added for various PRs that were we didn't backport in time for 5.x point releases.

ISSUE TYPE

    Bugfix Pull Request

COMPONENT NAME

plugins/modules/cloudwatch_metric_alarm.py
plugins/modules/ec2_ami.py
plugins/modules/ec2_metadata_facts.py
plugins/modules/ec2_vpc_nat_gateway.py
plugins/modules/kms_key.py
plugins/modules/lambda.py
plugins/modules/lambda_event.py
plugins/modules/lambda_layer.py
plugins/modules/lambda_layer_info.py
plugins/modules/rds_cluster.py

ADDITIONAL INFORMATION
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-5 PR should be backported to the stable-5 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants