Skip to content

OADP-4884: Attributes for OADP 1.4.3#88238

Merged
skrthomas merged 1 commit intoopenshift:mainfrom
anarnold97:oadp-4884-attributes-update-OADP-1.4.3
Feb 19, 2025
Merged

OADP-4884: Attributes for OADP 1.4.3#88238
skrthomas merged 1 commit intoopenshift:mainfrom
anarnold97:oadp-4884-attributes-update-OADP-1.4.3

Conversation

@anarnold97
Copy link
Contributor

@anarnold97 anarnold97 commented Feb 7, 2025

JIRA

VERSIONS

  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16
  • OCP 4.17 → branch/enterprise-4.17
  • OCP 4.18 → branch/enterprise-4.18

PREVIEWS

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 7, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 7, 2025

@anarnold97: This pull request references OADP-4884 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 task to target the "4.19.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 7, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 7, 2025

🤖 Sat Feb 08 03:04:05 - Prow CI generated the docs preview:
https://88238--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@anarnold97 anarnold97 force-pushed the oadp-4884-attributes-update-OADP-1.4.3 branch from 71e58b2 to 0fa3403 Compare February 7, 2025 19:24
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 7, 2025

@anarnold97: This pull request references OADP-4884 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 task to target the "4.19.0" version, but no target version was set.

Details

In response to this:

JIRA

VERSIONS

  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16
  • OCP 4.17 → branch/enterprise-4.17
  • OCP 4.18 → branch/enterprise-4.18

PREVIEWS

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@anarnold97
Copy link
Contributor Author

/label oadp

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Feb 7, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 7, 2025
Signed-off-by: A.Arnold <anarnold@redhat.com>
@anarnold97 anarnold97 force-pushed the oadp-4884-attributes-update-OADP-1.4.3 branch from 0fa3403 to c8bc774 Compare February 8, 2025 02:45
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2025
@openshift-ci
Copy link

openshift-ci bot commented Feb 8, 2025

@anarnold97: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@amastbau
Copy link

amastbau commented Feb 9, 2025

/LGTM

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2025
@anarnold97
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Feb 9, 2025
@xenolinux xenolinux added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 10, 2025
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

LGTM

@xenolinux xenolinux added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Feb 10, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 18, 2025

@anarnold97: This pull request references OADP-4884 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 task to target the "4.19.0" version, but no target version was set.

Details

In response to this:

JIRA

VERSIONS

  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16
  • OCP 4.17 → branch/enterprise-4.17
  • OCP 4.18 → branch/enterprise-4.18

PREVIEWS

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@anarnold97
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Feb 19, 2025
@skrthomas skrthomas added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.15 branch/enterprise-4.16 and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Feb 19, 2025
@skrthomas
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@skrthomas: once the present PR merges, I will cherry-pick it on top of enterprise-4.15 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@skrthomas
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@skrthomas: once the present PR merges, I will cherry-pick it on top of enterprise-4.16 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@skrthomas
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@skrthomas: once the present PR merges, I will cherry-pick it on top of enterprise-4.17 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@skrthomas
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@skrthomas: once the present PR merges, I will cherry-pick it on top of enterprise-4.18 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@skrthomas skrthomas merged commit d7366c4 into openshift:main Feb 19, 2025
2 checks passed
@openshift-cherrypick-robot

@skrthomas: #88238 failed to apply on top of branch "enterprise-4.15":

Applying: OADP-4884: Attributes for OADP 1.4.3
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OADP-4884: Attributes for OADP 1.4.3

Details

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@skrthomas: new pull request created: #88886

Details

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@skrthomas: new pull request created: #88888

Details

In response to this:

/cherrypick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@skrthomas: new pull request created: #88889

Details

In response to this:

/cherrypick enterprise-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. merge-review-in-progress Signifies that the merge review team is reviewing this PR OADP Label for all OADP PRs peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants