search

openshift / machine-config-operator

Apache License 2.0
245 stars 409 forks source link

[release-4.13] OCPBUGS-38295: daemon/update: disable systemd unit before overwriting #4522

Closed openshift-cherrypick-robot closed 2 months ago

openshift-cherrypick-robot commented 2 months ago

This is an automated cherry-pick of #4447

/assign yuqi-zhang

openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-36356 has been cloned as Jira Issue OCPBUGS-38295. Will retitle bug to link to clone. /retitle [release-4.13] OCPBUGS-38295: daemon/update: disable systemd unit before overwriting

In response to [this](https://github.com/openshift/machine-config-operator/pull/4522): >This is an automated cherry-pick of #4447 > >/assign yuqi-zhang Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). 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.
openshift-ci-robot commented 2 months ago

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

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.13.z) matches configured target version for branch (4.13.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36356](https://issues.redhat.com//browse/OCPBUGS-36356) is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-36356](https://issues.redhat.com//browse/OCPBUGS-36356) targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z * bug has dependents

Requesting review from QA contact: /cc @sergiordlr

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

In response to [this](https://github.com/openshift/machine-config-operator/pull/4522): >This is an automated cherry-pick of #4447 > >/assign yuqi-zhang Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). 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.
openshift-ci[bot] commented 2 months ago

@openshift-cherrypick-robot: The following tests 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/okd-scos-e2e-aws-ovn f62bcee06b1979ae000cd4ae89af7be5224c3c69 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-hypershift f62bcee06b1979ae000cd4ae89af7be5224c3c69 link false /test e2e-hypershift

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
sergiordlr commented 2 months ago

/label cherry-pick-approved

yuqi-zhang commented 2 months ago

/label backport-risk-assessed

Should only help in this case

yuqi-zhang commented 2 months ago

/lgtm

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, yuqi-zhang

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](https://github.com/openshift/machine-config-operator/blob/release-4.13/OWNERS)~~ [yuqi-zhang] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-38295: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/machine-config-operator/pull/4522): >This is an automated cherry-pick of #4447 > >/assign yuqi-zhang Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). 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.
yuqi-zhang commented 2 months ago

/cherry-pick release-4.12

openshift-cherrypick-robot commented 2 months ago

@yuqi-zhang: #4522 failed to apply on top of branch "release-4.12":

Applying: daemon/update: disable systemd unit before overwriting
Using index info to reconstruct a base tree...
A   pkg/daemon/file_writers.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/daemon/file_writers.go deleted in HEAD and modified in daemon/update: disable systemd unit before overwriting. Version daemon/update: disable systemd unit before overwriting of pkg/daemon/file_writers.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 daemon/update: disable systemd unit before overwriting
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](https://github.com/openshift/machine-config-operator/pull/4522#issuecomment-2284992148): >/cherry-pick release-4.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 2 months ago

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator This PR has been included in build ose-machine-config-operator-container-v4.13.0-202408122209.p0.g7bd58df.assembly.stream.el8. All builds following this will include this PR.

openshift-merge-robot commented 2 months ago

Fix included in accepted release 4.13.0-0.nightly-2024-08-12-230605