Closed simonpasquier closed 4 months ago
@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, 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.
/hold
/jira refresh
@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @juzhao
/hold cancel
/retest
/jira refresh
@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, which is valid.
Requesting review from QA contact: /cc @juzhao
@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, 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.
/retest
updated "Target Version"to 4.17.0, updated "Target Backport Versions" to 4.15.z, 4.16.0 /jira refresh
@juzhao: This pull request references Jira Issue OCPBUGS-33645, which is valid.
Requesting review from QA contact: /cc @juzhao
/test e2e-aws-ovn-single-node
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: marioferh, simonpasquier
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest
/retest-required
Remaining retests: 0 against base HEAD ed7ec0a88eee4909ec60db086c0da7e82140de5f and 2 for PR HEAD f264fb168198e0cae8dc476f3e8e6a0b1c5098c4 in total
/retest-required
@simonpasquier: all tests passed!
Full PR test history. Your PR dashboard.
@simonpasquier: Jira Issue OCPBUGS-33645: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-33645 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-monitoring-operator-container-v4.17.0-202405272212.p0.g640c7c4.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.
/cherry-pick release-4.16
@simonpasquier: #2349 failed to apply on top of branch "release-4.16":
Applying: OCPBUGS-33645: inject trusted CA bundle into UWM Alertmanager
Using index info to reconstruct a base tree...
M assets/alertmanager-user-workload/alertmanager.yaml
Falling back to patching base and 3-way merge...
Auto-merging assets/alertmanager-user-workload/alertmanager.yaml
CONFLICT (content): Merge conflict in assets/alertmanager-user-workload/alertmanager.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 OCPBUGS-33645: inject trusted CA bundle into UWM Alertmanager
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".