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

Fix introduced bug in elb_target_group_info #1015

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Fix introduced bug in elb_target_group_info #1015

merged 1 commit into from
Mar 25, 2022

Conversation

marknet15
Copy link
Contributor

SUMMARY

Fix bug introduced here: #1001

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

elb_target_group_info

ADDITIONAL INFORMATION

@ansibullbot
Copy link

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

@ansibullbot ansibullbot added bug This issue/PR relates to a bug community_review module module needs_triage plugins plugin (any type) small_patch Hopefully easy to review labels Mar 24, 2022
@alinabuzachis alinabuzachis added backport-2 PR should be backported to the stable-2 branch backport-3 PR should be backported to the stable-3 branch labels Mar 24, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@marknet15
Copy link
Contributor Author

@alinabuzachis @markuman would one of you be able to close these ?
#1006
#1005

With them closing would the patchback bot still raise the correct PRs for this one with the changes from the earlier PR ?

@markuman markuman added the mergeit Merge the PR (SoftwareFactory) label Mar 25, 2022
This was referenced Mar 25, 2022
Closed
Closed
@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

@marknet15
Copy link
Contributor Author

regate

@markuman
Copy link
Member

I think we must wait until this is fixed

/bin/sh: line 1: /usr/bin/ansible-galaxy: No such file or directory

@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

@markuman
Copy link
Member

cc @goneri

@marknet15
Copy link
Contributor Author

regate

1 similar comment
@marknet15
Copy link
Contributor Author

regate

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

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

patchback bot commented Mar 25, 2022 •
edited
Loading

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

❌ Failed to cleanly apply be4a4a2 on top of patchback/backports/stable-2/be4a4a20f90c69229d8b60916319e874d3997b49/pr-1015

Backporting merged PR #1015 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/be4a4a20f90c69229d8b60916319e874d3997b49/pr-1015 upstream/stable-2
  4. Now, cherry-pick PR Fix introduced bug in elb_target_group_info #1015 contents into that branch: 
    $ git cherry-pick -x be4a4a20f90c69229d8b60916319e874d3997b49
    If it'll yell at you with something like fatal: Commit be4a4a20f90c69229d8b60916319e874d3997b49 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x be4a4a20f90c69229d8b60916319e874d3997b49
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix introduced bug in elb_target_group_info #1015 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-2/be4a4a20f90c69229d8b60916319e874d3997b49/pr-1015
  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 Mar 25, 2022 •
edited
Loading

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

❌ Failed to cleanly apply be4a4a2 on top of patchback/backports/stable-3/be4a4a20f90c69229d8b60916319e874d3997b49/pr-1015

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

marknet15 added a commit to marknet15/community.aws that referenced this pull request Mar 26, 2022
@marknet15
Fix introduced bug (ansible-collections#1015)
740610e 
Fix introduced bug in elb_target_group_info

SUMMARY
Fix bug introduced here: ansible-collections#1001
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
elb_target_group_info
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Markus Bergholz <[email protected]>
@marknet15 marknet15 mentioned this pull request Mar 26, 2022
Merged
marknet15 added a commit to marknet15/community.aws that referenced this pull request Mar 26, 2022
@marknet15
Fix introduced bug (ansible-collections#1015)
9a16234 
Fix introduced bug in elb_target_group_info

SUMMARY
Fix bug introduced here: ansible-collections#1001
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
elb_target_group_info
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Markus Bergholz <[email protected]>
@marknet15 marknet15 mentioned this pull request Mar 26, 2022
Merged
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Mar 26, 2022
@marknet15
Backport elb_target_group_info PRs to stable-2 (#1018)
126962d 
Backport elb_target_group_info PRs to stable-2

SUMMARY
Backport elb_target_group_info PRs to stable-2
Original PRs:
#1001 (backoff)
#1015 (fix)
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
elb_target_group_info
ADDITIONAL INFORMATION

Reviewed-by: Markus Bergholz <[email protected]>
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Mar 26, 2022
@marknet15
Backport elb_target_group_info PRs to stable-3 (#1019)
94c7ca8 
Backport elb_target_group_info PRs to stable-3

SUMMARY
Backport elb_target_group_info PRs to stable-3
Original PRs:
#1001 (backoff)
#1015 (fix)
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
elb_target_group_info
ADDITIONAL INFORMATION

Reviewed-by: Markus Bergholz <[email protected]>
abikouo pushed a commit to abikouo/community.aws that referenced this pull request Oct 24, 2023
@goneri
tests: add unit-tests for calculate_etag() (ansible-collections#1015)
ad9ddf3 
tests: add unit-tests for calculate_etag()

Add test coverage for calucalte_etag that cover the two cases (with or without multipart).

Reviewed-by: Jill R <None>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alinabuzachis alinabuzachis alinabuzachis approved these changes

@markuman markuman markuman approved these changes

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 bug This issue/PR relates to a bug community_review mergeit Merge the PR (SoftwareFactory) module module plugins plugin (any type) small_patch Hopefully easy to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@marknet15 @ansibullbot @markuman @alinabuzachis