[release-4.6] Bug 1933075: backport systemd dropin/units zero-length handling

[darkmuggle]

Dependency backports for Bug 1933077.

This fixes a problem were a previous dropin/unit is replaced with zero
length file by ensuring that drops/units have actual content.

Signed-off-by: Ben Howard ben.howard@redhat.com
(cherry picked from commit c6df6d8)

The previous commit checks for IsNotExist as a return of
checkFileContentsAndMode, which since we wrap the error, will
never be the case, thus always erroring there. Instead check
for the error in a separate case.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.

[openshift-ci-robot]

@darkmuggle: This pull request references Bugzilla bug 1933075, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.z) matches configured target release for branch (4.6.z)
• bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1920027 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
• dependent Bugzilla bug 1920027 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0, 4.7.z
• bug has dependents

In response to this:

Bug 1933075: backport systemd dropin/units zero-length handling

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.

[darkmuggle]

Cherry-picks did not cleanly apply, this is a hand-crafted artisanal commit:
#2363 (comment)

[kikisdeliveryservice]

Does this need to merge first? Or second?

[openshift-ci]

@darkmuggle: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/okd-e2e-gcp-op	122d195	link	/test okd-e2e-gcp-op

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.

[kikisdeliveryservice]

failing test is very red

/skip

[darkmuggle]

Does this need to merge first? Or second?

@kikisdeliveryservice this should merge first

[sinnykumari]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: darkmuggle, kikisdeliveryservice, sinnykumari

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 [kikisdeliveryservice,sinnykumari]

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

[derekwaynecarr]

(Patch Manager) met criteria.

[openshift-ci-robot]

@darkmuggle: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#2435

Bugzilla bug 1933075 has been moved to the MODIFIED state.

In response to this:

[release-4.6] Bug 1933075: backport systemd dropin/units zero-length handling

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.