Closed edcdavid closed 6 months ago
/cc @imiller0
@edcdavid: This pull request references Jira Issue OCPBUGS-32756, 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.
/jira refresh
@edcdavid: This pull request references Jira Issue OCPBUGS-32756, 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/1890#issuecomment-2086046044): >/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 @irinamihai @sabbir-47
/cc @irinamihai @sabbir-47
@edcdavid: 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 | bdd9ebb09f76a1cfc7a19c2118407adde810b72a | link | false | /test e2e-aws-ran-profile |
Full PR test history. Your PR dashboard.
/lgtm
/approve
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: edcdavid, irinamihai
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@edcdavid: Jira Issue OCPBUGS-32756: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-32756 has been moved to the MODIFIED state.
/cherrypick release-4.15
@edcdavid: #1890 failed to apply on top of branch "release-4.15":
Applying: ztp: Add documentation to explain how to select the multicluster-operators-subscription image
.git/rebase-apply/patch:18: trailing whitespace.
1. Select the multicluster-operators-subscription image to work with your ACM version.
.git/rebase-apply/patch:19: trailing whitespace.
.git/rebase-apply/patch:24: trailing whitespace.
.git/rebase-apply/patch:25: trailing whitespace.
The version of the multicluster-operators-subscription image should match the ACM version. For instance, for ACM 2.10, use the `multicluster-operators-subscription-rhel9:v2.10` image.
.git/rebase-apply/patch:26: trailing whitespace.
For ACM 2.9, use the `multicluster-operators-subscription-rhel8:v2.9` image.
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M ztp/gitops-subscriptions/argocd/README.md
Falling back to patching base and 3-way merge...
Auto-merging ztp/gitops-subscriptions/argocd/README.md
CONFLICT (content): Merge conflict in ztp/gitops-subscriptions/argocd/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 documentation to explain how to select the multicluster-operators-subscription image
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".
/cherrypick release-4.14
@edcdavid: #1890 failed to apply on top of branch "release-4.14":
Applying: ztp: Add documentation to explain how to select the multicluster-operators-subscription image
.git/rebase-apply/patch:18: trailing whitespace.
1. Select the multicluster-operators-subscription image to work with your ACM version.
.git/rebase-apply/patch:19: trailing whitespace.
.git/rebase-apply/patch:24: trailing whitespace.
.git/rebase-apply/patch:25: trailing whitespace.
The version of the multicluster-operators-subscription image should match the ACM version. For instance, for ACM 2.10, use the `multicluster-operators-subscription-rhel9:v2.10` image.
.git/rebase-apply/patch:26: trailing whitespace.
For ACM 2.9, use the `multicluster-operators-subscription-rhel8:v2.9` image.
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M ztp/gitops-subscriptions/argocd/README.md
Falling back to patching base and 3-way merge...
Auto-merging ztp/gitops-subscriptions/argocd/README.md
CONFLICT (content): Merge conflict in ztp/gitops-subscriptions/argocd/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 documentation to explain how to select the multicluster-operators-subscription image
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".
This is to add a note about using the reference argocd-openshift-gitops-patch.json ( link) in disconnected environments where the image urls contained in the file may need to be adpated.