Closed Missxiaoguo closed 6 months ago
@Missxiaoguo: This pull request references Jira Issue OCPBUGS-33364, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: Missxiaoguo
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/uncc @lack @simon3z
/jira refresh
@Missxiaoguo: This pull request references Jira Issue OCPBUGS-33364, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @mpmaruthu
@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: mpmaruthu.
Note that only openshift-kni members and repo collaborators can review this PR, and authors cannot review their own PRs.
Requesting review from QA contact: /cc @mpmaruthu
In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1896#issuecomment-2098786538): >/jira refresh > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift-kni%2Fcnf-features-deploy). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
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.
/cc @imiller0 @sabbir-47 @jc-rh
/lgtm
/retest-required
@Missxiaoguo: The following test failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
ci/prow/e2e-aws-ran-profile | 544c8b2b7aea148e089f9b2d91d6a10d503bd3f7 | link | false | /test e2e-aws-ran-profile |
Full PR test history. Your PR dashboard.
/retest-required
@Missxiaoguo: Jira Issue OCPBUGS-33364: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-33364 has been moved to the MODIFIED state.
/cherry-pick release-4.15
@Missxiaoguo: #1896 failed to apply on top of branch "release-4.15":
Applying: ztp: Add IBU examples
.git/rebase-apply/patch:65: trailing whitespace.
As shown in the example below, this will create a Configmap named `oadp-cm` in the namespace `ztp-group` namespace on the hub cluster.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
Falling back to patching base and 3-way merge...
Removing ztp/gitops-subscriptions/argocd/example/image-based-upgrades/example-oadp-policy.yaml
Auto-merging ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
CONFLICT (content): Merge conflict in ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ztp: Add IBU examples
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 release-4.15
@Missxiaoguo: #1896 failed to apply on top of branch "release-4.15":
Applying: ztp: Add IBU examples
.git/rebase-apply/patch:65: trailing whitespace.
As shown in the example below, this will create a Configmap named `oadp-cm` in the namespace `ztp-group` namespace on the hub cluster.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
Falling back to patching base and 3-way merge...
Removing ztp/gitops-subscriptions/argocd/example/image-based-upgrades/example-oadp-policy.yaml
Auto-merging ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
CONFLICT (content): Merge conflict in ztp/gitops-subscriptions/argocd/example/image-based-upgrades/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ztp: Add IBU examples
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 release-4.15
@Missxiaoguo: new pull request created: #1952