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: Restructure integration tests to reduce runtime #1036

Merged
merged 2 commits into from
Mar 31, 2022
Merged

ec2_asg: Restructure integration tests to reduce runtime #1036

merged 2 commits into from
Mar 31, 2022

Conversation

mandar242
Copy link
Contributor

SUMMARY

ec2_asg tests are frequently timing out in CI.
Breaking up tests into multiple task files that can be run concurrently.

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

ec2_asg

@ansibullbot
Copy link

cc @garethr @jillr @markuman @s-hertel @tremble
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 Mar 30, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

@mandar242
Copy link
Contributor Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@mandar242 mandar242 mentioned this pull request Mar 30, 2022
Merged
1 task
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@markuman markuman added the backport-3 PR should be backported to the stable-3 branch label Mar 30, 2022
jillr
jillr approved these changes Mar 30, 2022
View reviewed changes
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.

Good work!

@jillr jillr added the mergeit Merge the PR (SoftwareFactory) label Mar 30, 2022
@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

@mandar242
Copy link
Contributor Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit ca82c10 into ansible-collections:main Mar 31, 2022
@patchback
Copy link

patchback bot commented Mar 31, 2022 •
edited
Loading

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

❌ Failed to cleanly apply ca82c10 on top of patchback/backports/stable-3/ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3/pr-1036

Backporting merged PR #1036 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/ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3/pr-1036 upstream/stable-3
  4. Now, cherry-pick PR ec2_asg: Restructure integration tests to reduce runtime #1036 contents into that branch: 
    $ git cherry-pick -x ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3
    If it'll yell at you with something like fatal: Commit ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ec2_asg: Restructure integration tests to reduce runtime #1036 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-3/ca82c105dde0c9eb6ebeb5aea325ea0bf664d0c3/pr-1036
  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 deleted the ec2_asg-modify-integration-tests-structure branch March 31, 2022 04:36
@markuman markuman mentioned this pull request Mar 31, 2022
Merged
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Mar 31, 2022
@markuman
ec2_asg: Restructure integration tests to reduce runtime (#1036) (#1041)
acfb37f 
backport-3: ec2_asg: Restructure integration tests to reduce runtime (#1036)

backport: ec2_asg: Restructure integration tests to reduce runtime #1036
SUMMARY
ec2_asg tests are frequently timing out in CI.
Breaking up tests into multiple task files that can be run concurrently.
ISSUE TYPE
Feature Pull Request
COMPONENT NAME
ec2_asg
Reviewed-by: Joseph Torcasso 
Reviewed-by: Jill R

Reviewed-by: Mark Woolley <[email protected]>
Reviewed-by: Alina Buzachis <None>
@mandar242 mandar242 mentioned this pull request Apr 1, 2022
Closed
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 1, 2022
@mandar242
Add check_mode support to ec2_asg (#1033)
13a20d4 
Add check_mode support to ec2_asg

SUMMARY

Added check_mode support to ec2_asg.


 CI failure could be resolved by #1036

ISSUE TYPE


Feature Pull Request

COMPONENT NAME

ec2_asg

Reviewed-by: Markus Bergholz <[email protected]>
Reviewed-by: Jill R <None>
patchback bot pushed a commit that referenced this pull request Apr 1, 2022
@mandar242 @patchback
Add check_mode support to ec2_asg (#1033)
92881e1 
Add check_mode support to ec2_asg

SUMMARY

Added check_mode support to ec2_asg.

 CI failure could be resolved by #1036

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

ec2_asg

Reviewed-by: Markus Bergholz <[email protected]>
Reviewed-by: Jill R <None>
(cherry picked from commit 13a20d4)
@patchback patchback bot mentioned this pull request Apr 1, 2022
Merged
1 task
@renovate renovate bot mentioned this pull request Apr 6, 2022
Merged
1 task
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 16, 2022
@patchback
Add check_mode support to ec2_asg (#1033) (#1046)
ba9b75f 
[PR #1033/13a20d48 backport][stable-3] Add check_mode support to ec2_asg

This is a backport of PR #1033 as merged into main (13a20d4).
SUMMARY

Added check_mode support to ec2_asg.


 CI failure could be resolved by #1036

ISSUE TYPE


Feature Pull Request

COMPONENT NAME

ec2_asg

Reviewed-by: Markus Bergholz <[email protected]>
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

@jillr jillr jillr approved these changes

Assignees
No one assigned
Labels
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.
5 participants
@mandar242 @ansibullbot @jillr @jatorcasso @markuman