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_asg: minor fix - run setup only once #1061

Merged
merged 1 commit into from
Apr 13, 2022
Merged

ec2_asg: minor fix - run setup only once #1061

merged 1 commit into from
Apr 13, 2022

Conversation

mandar242
Copy link
Contributor

SUMMARY

Fix integration tests bug in ec2_asg and run env_setup only once.

The bug causes env_setup.yml to run as many times as the number of tests in inventory file.
This causes removing test VPC to fail with the error
"msg": "Currently there are 3 VPCs that have the same name and CIDR block you specified. If you would like to create the VPC anyway please pass True to the multi_ok param.",

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ec2_asg

@mandar242 mandar242 changed the title Minor fix: run setup only once ec2_asg: minor fix - run setup only once Apr 13, 2022
jatorcasso
jatorcasso approved these changes Apr 13, 2022
View reviewed changes
Copy link
Contributor

@jatorcasso jatorcasso left a comment

Choose a reason for hiding this comment

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

LGTM after changelog

goneri
goneri reviewed Apr 13, 2022
View reviewed changes
tests/integration/targets/ec2_asg/roles/ec2_asg/tasks/env_setup.yml Outdated
@@ -1,5 +1,5 @@
- name: Run ec2_asg integration tests.

run_once: '{{ setup_run_once | default("no") | bool }}'
Copy link
Member

Choose a reason for hiding this comment

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

I would instead use tests/integration/targets/ec2_asg/roles/ec2_asg/default/main.yaml to define a default setup_run_once value for the role.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Thanks!

@jatorcasso jatorcasso added the backport-3 PR should be backported to the stable-3 branch label Apr 13, 2022
@ansibullbot
Copy link

cc @garethr @jillr @markuman @s-hertel @tremble
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug community_review integration tests/integration plugins plugin (any type) small_patch Hopefully easy to review tests tests labels Apr 13, 2022
@mandar242 mandar242 force-pushed the ec2_asg_integration_setup_bug_fix branch from 60bba32 to ee5869e Compare April 13, 2022 19:34
@mandar242 mandar242 force-pushed the ec2_asg_integration_setup_bug_fix branch from ee5869e to 6464bf4 Compare April 13, 2022 19:36
@ansibullbot ansibullbot removed the small_patch Hopefully easy to review label Apr 13, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@mandar242 mandar242 added the mergeit Merge the PR (SoftwareFactory) label Apr 13, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 0e54134 into ansible-collections:main Apr 13, 2022
@patchback
Copy link

patchback bot commented Apr 13, 2022 •
edited
Loading

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

❌ Failed to cleanly apply 0e54134 on top of patchback/backports/stable-3/0e54134dd6ccfc8550e3b91f56940878995e6ff5/pr-1061

Backporting merged PR #1061 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-3/0e54134dd6ccfc8550e3b91f56940878995e6ff5/pr-1061 upstream/stable-3
  4. Now, cherry-pick PR ec2_asg: minor fix - run setup only once #1061 contents into that branch: 
    $ git cherry-pick -x 0e54134dd6ccfc8550e3b91f56940878995e6ff5
    If it'll yell at you with something like fatal: Commit 0e54134dd6ccfc8550e3b91f56940878995e6ff5 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x 0e54134dd6ccfc8550e3b91f56940878995e6ff5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ec2_asg: minor fix - run setup only once #1061 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-3/0e54134dd6ccfc8550e3b91f56940878995e6ff5/pr-1061
  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.

@mandar242 mandar242 mentioned this pull request Apr 14, 2022
Closed
@renovate renovate bot mentioned this pull request Jun 24, 2022
Merged
1 task
@mandar242 mandar242 deleted the ec2_asg_integration_setup_bug_fix branch June 30, 2022 20:43
abikouo pushed a commit to abikouo/community.aws that referenced this pull request Oct 24, 2023
@tremble
Add missing 'legacy_missing_tests' alias entries (ansible-collections…
d750318 
…#1061)

Add missing 'legacy_missing_tests' alias entries

SUMMARY
During migrations a couple of 'legacy_missing_tests' aliase entries were missed.  Add them
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
tests/integration/targets/legacy_missing_tests/aliases
ADDITIONAL INFORMATION
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jatorcasso jatorcasso jatorcasso approved these changes

@goneri goneri goneri approved these changes

Assignees
No one assigned
Labels
backport-3 PR should be backported to the stable-3 branch bug This issue/PR relates to a bug community_review 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
@mandar242 @ansibullbot @goneri @jatorcasso