Closed stillalearner closed 1 month ago
@stillalearner: This pull request references OADP-3050 which is a valid jira issue.
Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.
@stillalearner: This pull request references OADP-3050 which is a valid jira issue.
Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.
Have to double check but hopefully this doesn't break the workaround in https://issues.redhat.com/browse/OADP-3630
I think it should not, as these changes only deal with the BSLs having all of the 3 labels.
While the workaround is only adding one of those. What do you think @kaovilai ?
@stillalearner: This pull request references OADP-3050 which is a valid jira issue.
Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.
Did some manual tests with BSL
also good to do some tests with VSL
add new BSL to DPA expect: one creation/no deletion
master ✅ PR ✅
change existing BSL spec from DPA expect: no creation/no deletion
master ✅ PR ✅
change existing BSL name from DPA expect: one creation/one deletion
master ❌ PR ✅
remove existing BSL from DPA expect: no creation/one deletion
master ❌ PR ✅
delete DPA expect: no creation/all deletion
master ✅ PR ✅
Thanks @mateusoliveira43 !! I also performed most of these test cases with BSL and VSL both and some other corner cases as well.
/retest
/retest
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: kaovilai, mateusoliveira43, shubham-pampattiwar, sseago, stillalearner
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest
@stillalearner: all tests passed!
Full PR test history. Your PR dashboard.
/cherry-pick oadp-1.3
@weshayutin: #1525 failed to apply on top of branch "oadp-1.3":
Applying: OADP-3050: Remove unwanted BSL/VSLs on create/edit DPA
Using index info to reconstruct a base tree...
M controllers/bsl.go
M controllers/vsl.go
M tests/e2e/dpa_deployment_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/dpa_deployment_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/dpa_deployment_suite_test.go
Auto-merging controllers/vsl.go
CONFLICT (content): Merge conflict in controllers/vsl.go
Auto-merging controllers/bsl.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OADP-3050: Remove unwanted BSL/VSLs on create/edit DPA
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
/cherry-pick oadp-1.4
@weshayutin: #1525 failed to apply on top of branch "oadp-1.4":
Applying: OADP-3050: Remove unwanted BSL/VSLs on create/edit DPA
Using index info to reconstruct a base tree...
M controllers/bsl.go
M controllers/vsl.go
M tests/e2e/dpa_deployment_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/dpa_deployment_suite_test.go
Auto-merging controllers/vsl.go
CONFLICT (content): Merge conflict in controllers/vsl.go
Auto-merging controllers/bsl.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OADP-3050: Remove unwanted BSL/VSLs on create/edit DPA
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
@stillalearner fyi ^
Fixes #1469 of unwanted BSL or VSLs in the cases:
hope that covers all cases.