OCPBUGS-22934: PTP operator needs infrastructure annotations to pass CVP tests

[jzding]

No description provided.

[aneeshkp]

/retitle OCPBUGS-22934: PTP operator needs infrastructure annotations to pass CVP tests

[openshift-ci-robot]

@jzding: This pull request references Jira Issue OCPBUGS-22934, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.0) matches configured target version for branch (4.15.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @gsr-shanks

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

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/test-infra repository.

[aneeshkp]

/hold

[aneeshkp]

/lgtm

[aneeshkp]

/unhold

[aneeshkp]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aneeshkp, jzding

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [aneeshkp,jzding]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@jzding: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

@jzding: Jira Issue OCPBUGS-22934: All pull requests linked via external trackers have merged:

• openshift/ptp-operator#396

Jira Issue OCPBUGS-22934 has been moved to the MODIFIED state.

In response to this:

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/test-infra repository.

[jzding]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@jzding: #396 failed to apply on top of branch "release-4.14":

Applying: add new infra annotations
Using index info to reconstruct a base tree...
M	bundle/manifests/ptp-operator.clusterserviceversion.yaml
M	config/manifests/bases/ptp-operator.clusterserviceversion.yaml
M	manifests/stable/ptp-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/stable/ptp-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in manifests/stable/ptp-operator.clusterserviceversion.yaml
Auto-merging config/manifests/bases/ptp-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in config/manifests/bases/ptp-operator.clusterserviceversion.yaml
Auto-merging bundle/manifests/ptp-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/ptp-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add new infra annotations
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".

In response to this:

/cherry-pick release-4.14

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/test-infra repository.