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

In integration tests use a common AMI rather than hard coded per test #1067

Merged
merged 3 commits into from
Apr 19, 2022
Merged

In integration tests use a common AMI rather than hard coded per test #1067

merged 3 commits into from
Apr 19, 2022

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Apr 14, 2022 •
edited
Loading

Depends-On: #1068

SUMMARY

Rather than hard coding the AMIs on a per-test basis, use a common AMI defined in setup_ec2_facts

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

ec2_asg_instance_refresh
ec2_asg_lifecycle_hook
ec2_asg_scheduled_action
ec2_launch_template
ec2_lc
ec2_metric_alarm
ec2_scaling_policy
elb_network_lb
elb_target
elb_target_info

ADDITIONAL INFORMATION

@ansibullbot
Copy link

cc @Zeekin @danquixote @garethr @jillr @marknet15 @markuman @s-hertel @wilvk @yaakov-github @Zeekin
click here for bot help

@ansibullbot ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration needs_triage plugins plugin (any type) tests tests labels Apr 14, 2022
@softwarefactory-project-zuul

This comment was marked as outdated.

Sign in to view
@tremble
Copy link
Contributor Author

tremble commented Apr 14, 2022

recheck

@tremble tremble changed the title In integration tests use a common AMI rather than hard coded In integration tests use a common AMI rather than hard coded per test Apr 14, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

@tremble
Copy link
Contributor Author

tremble commented Apr 16, 2022

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

@tremble tremble requested a review from mandar242 April 19, 2022 10:04
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@tremble tremble requested a review from markuman April 19, 2022 18:39
@markuman markuman added backport-2 PR should be backported to the stable-2 branch backport-3 PR should be backported to the stable-3 branch labels Apr 19, 2022
@jillr jillr added the mergeit Merge the PR (SoftwareFactory) label Apr 19, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 3f434f3 into ansible-collections:main Apr 19, 2022
@patchback
Copy link

patchback bot commented Apr 19, 2022 •
edited
Loading

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

❌ Failed to cleanly apply 3f434f3 on top of patchback/backports/stable-2/3f434f3f7f5bd736ee004ef88244bf6ec6436704/pr-1067

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

@patchback
Copy link

patchback bot commented Apr 19, 2022 •
edited
Loading

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/3f434f3f7f5bd736ee004ef88244bf6ec6436704/pr-1067

Backported as #1080

🤖 @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 Apr 19, 2022
@tremble @patchback
In integration tests use a common AMI rather than hard coded per test (…
41e36ca 
…#1067)

In integration tests use a common AMI rather than hard coded per test

Depends-On: #1068
SUMMARY
Rather than hard coding the AMIs on a per-test basis, use a common AMI defined in setup_ec2_facts
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_asg_instance_refresh
ec2_asg_lifecycle_hook
ec2_asg_scheduled_action
ec2_launch_template
ec2_lc
ec2_metric_alarm
ec2_scaling_policy
elb_network_lb
elb_target
elb_target_info
ADDITIONAL INFORMATION

Reviewed-by: Markus Bergholz <git@osuv.de>
Reviewed-by: Jill R <None>
(cherry picked from commit 3f434f3)
@patchback patchback bot mentioned this pull request Apr 19, 2022
Merged
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 20, 2022
@patchback
In integration tests use a common AMI rather than hard coded per test (…
5202b2c 
…#1067) (#1080)

[PR #1067/3f434f3f backport][stable-3] In integration tests use a common AMI rather than hard coded per test

This is a backport of PR #1067 as merged into main (3f434f3).
Depends-On: #1068
SUMMARY
Rather than hard coding the AMIs on a per-test basis, use a common AMI defined in setup_ec2_facts
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_asg_instance_refresh
ec2_asg_lifecycle_hook
ec2_asg_scheduled_action
ec2_launch_template
ec2_lc
ec2_metric_alarm
ec2_scaling_policy
elb_network_lb
elb_target
elb_target_info
ADDITIONAL INFORMATION

Reviewed-by: Markus Bergholz <git@osuv.de>
@tremble tremble deleted the common_ami branch July 7, 2022 19:27
abikouo pushed a commit to abikouo/community.aws that referenced this pull request Oct 24, 2023
@GomathiselviS
Handle ec2_vol.tags when the associated instance already exists (ansi…
ffd06e9 
…ble-collections#1071)

Handle ec2_vol.tags when the associated instance already exists

Signed-off-by: GomathiselviS gomathiselvi@gmail.com
SUMMARY


Fixes ansible-collections#1067
ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ec2_vol.py
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
Reviewed-by: GomathiselviS <None>
Reviewed-by: Mike Graves <mgraves@redhat.com>
Reviewed-by: Gonéri Le Bouder <goneri@lebouder.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jillr jillr jillr approved these changes

@markuman markuman markuman approved these changes

@mandar242 mandar242 Awaiting requested review from mandar242

Assignees
No one assigned
Labels
backport-2 PR should be backported to the stable-2 branch backport-3 PR should be backported to the stable-3 branch community_review feature This issue/PR relates to a feature request integration tests/integration mergeit Merge the PR (SoftwareFactory) plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tremble @ansibullbot @markuman @jillr