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

Backup selection bugfix #1701

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Backup selection bugfix #1701

merged 3 commits into from
Aug 23, 2023

Conversation

hakbailey
Copy link
Contributor

@hakbailey hakbailey commented Aug 14, 2023 •
edited by gravesm
Loading

SUMMARY

Fix bug in backup_selection where an existing backup selection was not updated to add Conditions if that value was previously empty.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

backup_selection

ADDITIONAL INFORMATION

Split into two commits, the first commit adds comprehensive integration tests to cover the scenarios that were failing and the second commit fixes the code.

@ansibullbot
Copy link

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

@ansibullbot ansibullbot added bug This issue/PR relates to a bug community_review integration tests/integration module module needs_triage plugins plugin (any type) tests tests labels Aug 14, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/07035196de4c4971b2bd591cd2d6d4f1

✔️ ansible-galaxy-importer SUCCESS in 3m 56s
✔️ build-ansible-collection SUCCESS in 12m 47s
✔️ ansible-test-splitter SUCCESS in 4m 53s
❌ integration-amazon.aws-1 RETRY_LIMIT in 4m 55s
Skipped 43 jobs

@hakbailey
Copy link
Contributor Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/d1474032eb13405ea3830702b27c680f

✔️ ansible-galaxy-importer SUCCESS in 4m 20s
✔️ build-ansible-collection SUCCESS in 12m 33s
✔️ ansible-test-splitter SUCCESS in 5m 10s
❌ integration-amazon.aws-1 RETRY_LIMIT in 1m 31s
Skipped 43 jobs

@gravesm
Copy link
Member

gravesm commented Aug 15, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/5ef8c1c5691a45e4abac74cc319906d9

✔️ ansible-galaxy-importer SUCCESS in 4m 59s
✔️ build-ansible-collection SUCCESS in 13m 37s
✔️ ansible-test-splitter SUCCESS in 5m 02s
❌ integration-amazon.aws-1 RETRY_LIMIT in 4m 07s
Skipped 43 jobs

@hakbailey
Copy link
Contributor Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/49250b3699c44b6c9a2c6b565804e2ab

✔️ ansible-galaxy-importer SUCCESS in 5m 00s
✔️ build-ansible-collection SUCCESS in 13m 24s
✔️ ansible-test-splitter SUCCESS in 5m 18s
❌ integration-amazon.aws-1 RETRY_LIMIT in 3m 16s
Skipped 43 jobs

@gravesm
Copy link
Member

gravesm commented Aug 15, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/b29da82b84a34c2f87d0c48ff12a0724

✔️ ansible-galaxy-importer SUCCESS in 5m 22s
✔️ build-ansible-collection SUCCESS in 15m 22s
✔️ ansible-test-splitter SUCCESS in 5m 21s
❌ integration-amazon.aws-1 RETRY_LIMIT in 5m 16s
Skipped 43 jobs

@gravesm
Copy link
Member

gravesm commented Aug 15, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/5476addf36e840b29eeb695341f2ed7d

✔️ ansible-galaxy-importer SUCCESS in 3m 47s
✔️ build-ansible-collection SUCCESS in 13m 38s
✔️ ansible-test-splitter SUCCESS in 5m 15s
❌ integration-amazon.aws-1 RETRY_LIMIT in 2m 50s
Skipped 43 jobs

@gravesm
Copy link
Member

gravesm commented Aug 15, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/63527a088f7f47c2a0fc444c51954ed1

✔️ ansible-galaxy-importer SUCCESS in 5m 30s
✔️ build-ansible-collection SUCCESS in 14m 08s
✔️ ansible-test-splitter SUCCESS in 5m 23s
❌ integration-amazon.aws-1 FAILURE in 8m 48s
Skipped 43 jobs

@komaldesai13
Copy link

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/b364661888b54cd68cc3223d4664999e

✔️ ansible-galaxy-importer SUCCESS in 3m 50s
✔️ build-ansible-collection SUCCESS in 15m 25s
✔️ ansible-test-splitter SUCCESS in 5m 06s
❌ integration-amazon.aws-1 FAILURE in 9m 44s
Skipped 43 jobs

@hakbailey
Copy link
Contributor Author

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible/ansible-zuul-jobs for 1818,2f1fba87388b2c0ce311f8b2d6e0c30328008472

@hakbailey hakbailey force-pushed the backup-selection-bugfix branch from 1610a56 to 4306fd5 Compare August 22, 2023 18:27
@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible/ansible-zuul-jobs for 1818,2f1fba87388b2c0ce311f8b2d6e0c30328008472

@gravesm
Copy link
Member

gravesm commented Aug 22, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/5381de169fa8497ca2967daed5cda89a

✔️ ansible-galaxy-importer SUCCESS in 4m 36s
✔️ build-ansible-collection SUCCESS in 12m 42s
✔️ ansible-test-splitter SUCCESS in 4m 40s
✔️ integration-amazon.aws-1 SUCCESS in 7m 50s
Skipped 43 jobs

@alinabuzachis alinabuzachis added the backport-6 PR should be backported to the stable-6 branch label Aug 23, 2023
@hakbailey hakbailey added the mergeit Merge the PR (SoftwareFactory) label Aug 23, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/18cd336eec4d42a59b24a1feeb55b3c0

✔️ ansible-galaxy-importer SUCCESS in 5m 26s
✔️ build-ansible-collection SUCCESS in 12m 35s
✔️ ansible-test-splitter SUCCESS in 4m 54s
✔️ integration-amazon.aws-1 SUCCESS in 9m 46s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 19b89f6 into ansible-collections:main Aug 23, 2023
@patchback
Copy link

patchback bot commented Aug 23, 2023 •
edited
Loading

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/19b89f682227f8755322250c929355812dc37a2c/pr-1701

Backported as #1710

🤖 @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 Aug 23, 2023
@hakbailey @patchback
Backup selection bugfix (#1701)
919d0ff 
Backup selection bugfix

SUMMARY
Fix bug in backup_selection where an existing backup selection was not updated to add Conditions if that value was previously empty.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
backup_selection
ADDITIONAL INFORMATION
Split into two commits, the first commit adds comprehensive integration tests to cover the scenarios that were failing and the second commit fixes the code.

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 19b89f6)
@patchback patchback bot mentioned this pull request Aug 23, 2023
Merged
hakbailey added a commit that referenced this pull request Aug 30, 2023
@hakbailey
Backup selection bugfix (#1701)
81e99a3 
Backup selection bugfix

SUMMARY
Fix bug in backup_selection where an existing backup selection was not updated to add Conditions if that value was previously empty.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
backup_selection
ADDITIONAL INFORMATION
Split into two commits, the first commit adds comprehensive integration tests to cover the scenarios that were failing and the second commit fixes the code.

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 19b89f6)
krisek pushed a commit to krisek/amazon.aws that referenced this pull request Aug 31, 2023
@hakbailey @krisek
Backup selection bugfix (ansible-collections#1701)
5cc3567 
Backup selection bugfix

SUMMARY
Fix bug in backup_selection where an existing backup selection was not updated to add Conditions if that value was previously empty.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
backup_selection
ADDITIONAL INFORMATION
Split into two commits, the first commit adds comprehensive integration tests to cover the scenarios that were failing and the second commit fixes the code.

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Alina Buzachis
hakbailey added a commit that referenced this pull request Sep 1, 2023
@hakbailey
Backup selection bugfix (#1701)
b5a008a 
Backup selection bugfix

SUMMARY
Fix bug in backup_selection where an existing backup selection was not updated to add Conditions if that value was previously empty.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
backup_selection
ADDITIONAL INFORMATION
Split into two commits, the first commit adds comprehensive integration tests to cover the scenarios that were failing and the second commit fixes the code.

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 19b89f6)
hakbailey added a commit that referenced this pull request Sep 1, 2023
@hakbailey
Merge pull request #1710 from ansible-collections/patchback/backports…
47b0125 
…/stable-6/19b89f682227f8755322250c929355812dc37a2c/pr-1701

[PR #1701/19b89f68 backport][stable-6] Backup selection bugfix
@hakbailey hakbailey deleted the backup-selection-bugfix branch September 19, 2023 14:14
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

@gravesm gravesm gravesm approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@hakbailey @ansibullbot @gravesm @komaldesai13 @alinabuzachis