ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321

tremble · 2023-01-05T15:26:53Z

SUMMARY

When using the image_available waiter shortly after triggering the creation of an AMI this can fail (Amazon sometimes return from creation calls, with an ID, before the APIs recognise that the resource exists)

Additionally splits up the AMI tests, it's sporadically timing out. (taking a snapshot of a running instance is slow)

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ec2_ami

ADDITIONAL INFORMATION

https://e7359f847acd480e3075-df27b72133198827a14e5ee13616eeff.ssl.cf1.rackcdn.com/periodic/github.com/ansible-collections/amazon.aws/main/integration-amazon.aws-target-ec2_ami/adb87fd/job-output.txt

ansibullbot · 2023-01-05T15:27:03Z

cc @Constantin07 @gunzy83 @jillr @s-hertel @scicoin-project @wilvk
click here for bot help

…e found

softwarefactory-project-zuul · 2023-01-05T17:23:10Z

Build succeeded.

softwarefactory-project-zuul · 2023-01-09T11:52:24Z

Build succeeded (gate pipeline).

patchback · 2023-01-09T11:52:28Z

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

❌ Failed to cleanly apply 6da1aaa on top of patchback/backports/stable-4/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321

Backporting merged PR #1321 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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-4/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321 upstream/stable-4

Now, cherry-pick PR ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321 contents into that branch:
```
$ git cherry-pick -x 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301
```
If it'll yell at you with something like fatal: Commit 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321

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.

patchback · 2023-01-09T11:52:33Z

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

❌ Failed to cleanly apply 6da1aaa on top of patchback/backports/stable-5/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321

Backporting merged PR #1321 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321 upstream/stable-5

Now, cherry-pick PR ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321 contents into that branch:
```
$ git cherry-pick -x 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301
```
If it'll yell at you with something like fatal: Commit 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 6da1aaa700e1c6f4b2b8c5e0f1af19394c536301
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-5/6da1aaa700e1c6f4b2b8c5e0f1af19394c536301/pr-1321

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.

github-actions · 2023-01-09T11:55:24Z

Docs Build 📝

Thank you for contribution!✨

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

Bulk update imports after reshuffle Depends-On: #1323 Depends-On: #1322 Depends-On: #1321 SUMMARY module_utils code got split up. Bulk update the imports to reflect this ISSUE TYPE Feature Pull Request COMPONENT NAME various ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis <None>

ansibullbot added bug This issue/PR relates to a bug community_review integration tests/integration module_utils module_utils needs_triage plugins plugin (any type) tests tests labels Jan 5, 2023

tremble added 3 commits January 5, 2023 17:16

ec2_ami - allow ImageAvailable waiter to retry when the image can't b…

6d67d3d

…e found

Split AMI tests

3b0dec0

changelog

67db6f2

tremble force-pushed the tests/stability/ec2_ami branch from 7f68cce to 67db6f2 Compare January 5, 2023 16:16

tremble marked this pull request as ready for review January 5, 2023 16:45

tremble requested a review from alinabuzachis January 5, 2023 16:45

tremble mentioned this pull request Jan 6, 2023

Bulk update imports after reshuffle #1310

Merged

tremble added backport-4 PR should be backported to the stable-4 branch backport-5 PR should be backported to the stable-5 branch labels Jan 9, 2023

alinabuzachis approved these changes Jan 9, 2023

View reviewed changes

tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 9, 2023

softwarefactory-project-zuul bot merged commit 6da1aaa into ansible-collections:main Jan 9, 2023

tremble deleted the tests/stability/ec2_ami branch February 15, 2023 09:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321

ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321

tremble commented Jan 5, 2023

ansibullbot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 9, 2023

patchback bot commented Jan 9, 2023 •

edited

Loading

patchback bot commented Jan 9, 2023 •

edited

Loading

github-actions bot commented Jan 9, 2023

ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321

ec2_ami - allow ImageAvailable waiter to retry when the image can't be found #1321

Conversation

tremble commented Jan 5, 2023

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

ansibullbot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 9, 2023

patchback bot commented Jan 9, 2023 • edited Loading

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

Backporting merged PR #1321 into main

patchback bot commented Jan 9, 2023 • edited Loading

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

Backporting merged PR #1321 into main

github-actions bot commented Jan 9, 2023

Docs Build 📝

patchback bot commented Jan 9, 2023 •

edited

Loading

patchback bot commented Jan 9, 2023 •

edited

Loading