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_vpc_nat_gateway - catch extra error code for invalid elastic IP Id #2418

Merged
merged 1 commit into from
Dec 11, 2024
Merged

ec2_vpc_nat_gateway - catch extra error code for invalid elastic IP Id #2418

merged 1 commit into from
Dec 11, 2024
+4 −1

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Dec 9, 2024

SUMMARY

Closes #1872

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ec2_vpc_nat_gateway

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 39s
✔️ build-ansible-collection SUCCESS in 10m 51s
✔️ ansible-test-splitter SUCCESS in 4m 06s
✔️ integration-amazon.aws-1 SUCCESS in 16m 41s
✔️ integration-amazon.aws-2 SUCCESS in 24m 57s
✔️ integration-amazon.aws-3 SUCCESS in 32m 15s
✔️ integration-amazon.aws-4 SUCCESS in 24m 51s
✔️ integration-amazon.aws-5 SUCCESS in 19m 57s
✔️ integration-amazon.aws-6 SUCCESS in 19m 51s
✔️ integration-amazon.aws-7 SUCCESS in 18m 35s
✔️ integration-amazon.aws-8 SUCCESS in 25m 22s
✔️ integration-amazon.aws-9 SUCCESS in 17m 03s
✔️ integration-amazon.aws-10 SUCCESS in 10m 58s
✔️ integration-amazon.aws-11 SUCCESS in 8m 53s
✔️ integration-amazon.aws-12 SUCCESS in 15m 49s
✔️ integration-amazon.aws-13 SUCCESS in 18m 01s
✔️ integration-amazon.aws-14 SUCCESS in 11m 20s
✔️ integration-amazon.aws-15 SUCCESS in 11m 08s
✔️ integration-amazon.aws-16 SUCCESS in 10m 08s
✔️ integration-amazon.aws-17 SUCCESS in 10m 44s
✔️ integration-amazon.aws-18 SUCCESS in 21m 01s
✔️ integration-amazon.aws-19 SUCCESS in 23m 05s
✔️ integration-amazon.aws-20 SUCCESS in 21m 05s
✔️ integration-amazon.aws-21 SUCCESS in 26m 45s
✔️ integration-amazon.aws-22 SUCCESS in 13m 29s
✔️ integration-community.aws-1 SUCCESS in 15m 35s
✔️ integration-community.aws-2 SUCCESS in 5m 34s
✔️ integration-community.aws-3 SUCCESS in 6m 22s
Skipped 19 jobs

@abikouo abikouo added the mergeit Merge the PR (SoftwareFactory) label Dec 11, 2024
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 10s
✔️ build-ansible-collection SUCCESS in 10m 10s
✔️ ansible-test-splitter SUCCESS in 4m 19s
✔️ integration-amazon.aws-1 SUCCESS in 16m 03s
✔️ integration-amazon.aws-2 SUCCESS in 23m 39s
✔️ integration-amazon.aws-3 SUCCESS in 28m 13s
✔️ integration-amazon.aws-4 SUCCESS in 23m 41s
✔️ integration-amazon.aws-5 SUCCESS in 19m 28s
✔️ integration-amazon.aws-6 SUCCESS in 18m 44s
✔️ integration-amazon.aws-7 SUCCESS in 22m 03s
✔️ integration-amazon.aws-8 SUCCESS in 22m 43s
✔️ integration-amazon.aws-9 SUCCESS in 16m 44s
✔️ integration-amazon.aws-10 SUCCESS in 14m 16s
✔️ integration-amazon.aws-11 SUCCESS in 13m 32s
✔️ integration-amazon.aws-12 SUCCESS in 21m 07s
✔️ integration-amazon.aws-13 SUCCESS in 18m 17s
✔️ integration-amazon.aws-14 SUCCESS in 13m 00s
✔️ integration-amazon.aws-15 SUCCESS in 8m 29s
✔️ integration-amazon.aws-16 SUCCESS in 13m 32s
✔️ integration-amazon.aws-17 SUCCESS in 10m 50s
✔️ integration-amazon.aws-18 SUCCESS in 14m 44s
✔️ integration-amazon.aws-19 SUCCESS in 17m 52s
✔️ integration-amazon.aws-20 SUCCESS in 21m 44s
✔️ integration-amazon.aws-21 SUCCESS in 26m 13s
✔️ integration-amazon.aws-22 SUCCESS in 12m 18s
✔️ integration-community.aws-1 SUCCESS in 17m 51s
✔️ integration-community.aws-2 SUCCESS in 7m 55s
✔️ integration-community.aws-3 SUCCESS in 5m 20s
Skipped 19 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit b9a5127 into ansible-collections:main Dec 11, 2024
45 checks passed
@patchback Patchback
Copy link

patchback bot commented Dec 11, 2024 •
edited
Loading

Backport to stable-9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-9/b9a512702556c02d01748f43b258eef74a9ad238/pr-2418

Backported as #2422

🤖 @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 Dec 11, 2024
@abikouo @patchback
ec2_vpc_nat_gateway - catch extra error code for invalid elastic IP Id (
b3fbdb5 
#2418)

SUMMARY

Closes #1872

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ec2_vpc_nat_gateway

Reviewed-by: Alina Buzachis
Reviewed-by: GomathiselviS <[email protected]>
(cherry picked from commit b9a5127)
@patchback patchback bot mentioned this pull request Dec 11, 2024
Open
@alinabuzachis alinabuzachis added the backport-8 PR should be backported to the stable-8 branch label Dec 11, 2024
@patchback Patchback
Copy link

patchback bot commented Dec 11, 2024 •
edited
Loading

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

❌ Failed to cleanly apply b9a5127 on top of patchback/backports/stable-8/b9a512702556c02d01748f43b258eef74a9ad238/pr-2418

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GomathiselviS GomathiselviS GomathiselviS approved these changes

@alinabuzachis alinabuzachis alinabuzachis approved these changes

Assignees
No one assigned
Labels
backport-8 PR should be backported to the stable-8 branch backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
3 participants
@abikouo @alinabuzachis @GomathiselviS