Skip to content

Conversation

@isabella-janssen
Copy link
Member

@isabella-janssen isabella-janssen commented Jan 20, 2026

Closes: OCPBUGS-58023

- What I did
This adds back the work introduced in #5527 then reverted in #5553. It depends on regression test improvemnts in openshift/origin#30705 to prevent future regressions.

This takes inspiration from the proposed fix for OCPBUGS-58023 in #5225 and updates some of the changes to be clearer and more maintainable per review suggestions. It includes cherry-picks of the following two commits

  • 4512ec4 - This was the original work for fixing the bug.
  • 40304eb - This was the commit that introduced a fix to address the test failures called out in TRT-2232.

and some cleanup.

- How to verify it
OCPBUGS-58023: See #5148 (comment) for previous verification steps.
TRT-2232: Payload tests previously impacted by this bug fix should pass.

  • Blocking payloads should pass
  • Informing payloads should pass consistent with historic rates
  • PR e2es should pass

- Description for the changelog
OCPBUGS-58023: Prevent unnecessary systemd unit disable

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 20, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 20, 2026
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2026
update: Only write added or updated systemd units
on_disk_validation: Check if systemd units in config enabled correctly

(cherry picked from commit 4512ec4)
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 20, 2026
@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2 periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-2of2

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2026

@isabella-janssen: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/443c1420-f62b-11f0-9af4-102648097252-0

@isabella-janssen
Copy link
Member Author

/payload-job-with-prs periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2 openshift/origin#30705

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2026

@isabella-janssen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ed4ef340-f656-11f0-9d8c-addd25b6ef13-0

@isabella-janssen isabella-janssen changed the title (WIP) OCPBUGS-58023: Prevent unnecessary systemd unit disable Jan 21, 2026
@isabella-janssen isabella-janssen marked this pull request as ready for review January 21, 2026 19:41
@openshift-ci-robot openshift-ci-robot added the jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. label Jan 21, 2026
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 21, 2026
@openshift-ci-robot
Copy link
Contributor

@isabella-janssen: This pull request references Jira Issue OCPBUGS-58023, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

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

Details

In response to this:

Closes: OCPBUGS-58023

- What I did
This adds back the work introduced in #5527 then reverted in #5553. It depends on regression test improvemnts in openshift/origin#30705 to prevent future regressions.

This takes inspiration from the proposed fix for OCPBUGS-58023 in #5225 and updates some of the changes to be clearer and more maintainable per review suggestions. It includes cherry-picks of the following two commits

  • 4512ec4 - This was the original work for fixing the bug.
  • 40304eb - This was the commit that introduced a fix to address the test failures called out in TRT-2232.

and some cleanup.

- How to verify it
OCPBUGS-58023: See #5148 (comment) for previous verification steps.
TRT-2232: Payload tests previously impacted by this bug fix should pass.

  • Blocking payloads should pass
  • Informing payloads should pass consistent with historic rates
  • PR e2es should pass

- Description for the changelog
OCPBUGS-58023: Prevent unnecessary systemd unit disable

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 openshift-eng/jira-lifecycle-plugin repository.

@isabella-janssen
Copy link
Member Author

/hold

This should merge after openshift/origin#30705.

@openshift-ci openshift-ci bot requested a review from sergiordlr January 21, 2026 19:41
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026
@openshift-ci openshift-ci bot requested review from RishabhSaini and djoshy January 21, 2026 19:42
@isabella-janssen
Copy link
Member Author

/payload-job-with-prs 4.22 nightly blocking openshift/origin#30705

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 21, 2026

@isabella-janssen: An error was encountered. No known errors were detected, please see the full error message for details.

Full error message. unable to get additional pr info from string: nightly: string: nightly doesn't match expected format: org/repo#number

Please contact an administrator to resolve this issue.

@isabella-janssen
Copy link
Member Author

/payload-job-with-pr 4.22 nightly blocking openshift/origin#30705

@isabella-janssen
Copy link
Member Author

/retest-required

@isabella-janssen
Copy link
Member Author

/payload 4.22 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 22, 2026

@isabella-janssen: trigger 14 job(s) of type blocking for the nightly release of OCP 4.22

  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips-no-nat-instance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv4
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b1046fe0-f7d8-11f0-8ffd-5dafc794a7fb-0

@pablintino
Copy link
Contributor

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 23, 2026
@openshift-ci-robot
Copy link
Contributor

@pablintino: This PR has been marked as verified by https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-machine-config-operator-5582-nightly-4.22-e2e-aws-ovn-serial-1of2/2014449085242675200.

Details

In response to this:

/verified by https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-machine-config-operator-5582-nightly-4.22-e2e-aws-ovn-serial-1of2/2014449085242675200

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 23, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen, pablintino

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [isabella-janssen,pablintino]

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

@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6

Double checking that these failures were flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 23, 2026

@isabella-janssen: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/80950630-f869-11f0-8c09-9a6979317915-0

@isabella-janssen
Copy link
Member Author

/payload 4.22 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 23, 2026

@isabella-janssen: trigger 14 job(s) of type blocking for the nightly release of OCP 4.22

  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips-no-nat-instance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv4
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/55e3d380-f87d-11f0-8d3c-dc6eead53ca9-0

@isabella-janssen
Copy link
Member Author

/payload 4.22 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2026

@isabella-janssen: trigger 14 job(s) of type blocking for the nightly release of OCP 4.22

  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.22-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-upgrade-fips-no-nat-instance
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv4
  • periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1adb7230-fab1-11f0-8fbf-d089061d748a-0

@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive-techpreview-2of2

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2026

@isabella-janssen: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive-techpreview-1of2
  • periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1d428520-fac7-11f0-919f-0736acd24e91-0

@isabella-janssen
Copy link
Member Author

/override ci/prow/e2e-gcp-op-ocl

This test is newly required, but flaking for unrelated reasons.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2026

@isabella-janssen: Overrode contexts on behalf of isabella-janssen: ci/prow/e2e-gcp-op-ocl

Details

In response to this:

/override ci/prow/e2e-gcp-op-ocl

This test is newly required, but flaking for unrelated reasons.

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-sigs/prow repository.

@isabella-janssen
Copy link
Member Author

/unhold

The latest run of payload tests for this PR looked good, so hopefully this fix sticks this time 🤞

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 26, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 27, 2026

@isabella-janssen: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 4994239 into openshift:main Jan 27, 2026
15 checks passed
@openshift-ci-robot
Copy link
Contributor

@isabella-janssen: Jira Issue OCPBUGS-58023: All pull requests linked via external trackers have merged:

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

Details

In response to this:

Closes: OCPBUGS-58023

- What I did
This adds back the work introduced in #5527 then reverted in #5553. It depends on regression test improvemnts in openshift/origin#30705 to prevent future regressions.

This takes inspiration from the proposed fix for OCPBUGS-58023 in #5225 and updates some of the changes to be clearer and more maintainable per review suggestions. It includes cherry-picks of the following two commits

  • 4512ec4 - This was the original work for fixing the bug.
  • 40304eb - This was the commit that introduced a fix to address the test failures called out in TRT-2232.

and some cleanup.

- How to verify it
OCPBUGS-58023: See #5148 (comment) for previous verification steps.
TRT-2232: Payload tests previously impacted by this bug fix should pass.

  • Blocking payloads should pass
  • Informing payloads should pass consistent with historic rates
  • PR e2es should pass

- Description for the changelog
OCPBUGS-58023: Prevent unnecessary systemd unit disable

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 openshift-eng/jira-lifecycle-plugin repository.

@isabella-janssen isabella-janssen deleted the ocpbugs-58023 branch January 27, 2026 15:53
@isabella-janssen
Copy link
Member Author

/cherrypick release-4.21,release-4.20,release-4.19,release-4.18,release-4.17

@openshift-cherrypick-robot

@isabella-janssen: cannot checkout release-4.21,release-4.20,release-4.19,release-4.18,release-4.17: error checking out "release-4.21,release-4.20,release-4.19,release-4.18,release-4.17": exit status 1 error: pathspec 'release-4.21,release-4.20,release-4.19,release-4.18,release-4.17' did not match any file(s) known to git

Details

In response to this:

/cherrypick release-4.21,release-4.20,release-4.19,release-4.18,release-4.17

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-sigs/prow repository.

@isabella-janssen
Copy link
Member Author

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18 release-4.17

@openshift-cherrypick-robot

@isabella-janssen: new pull request created: #5607

Details

In response to this:

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18 release-4.17

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants