[release-4.22] OCPBUGS-105929: Fix duplicate template error and e2es

[djoshy]

Manual cherry-pick of #6317 and #6387.

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: aad2e5aa-92bf-4c42-9861-23825fc88650

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

_{Comment @coderabbitai help to get the list of available commands.}

[djoshy]

/jira cherry-pick OCPBUGS-105426

[openshift-ci-robot]

@djoshy: Jira Issue OCPBUGS-105426 has been cloned as Jira Issue OCPBUGS-105929. Will retitle bug to link to clone.
/retitle OCPBUGS-105929: Fix duplicate template error and e2es

Details

In response to this:

/jira cherry-pick OCPBUGS-105426

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-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-105929, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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-robot]

@djoshy: No Jira issue with key CPBUGS-105929 exists in the tracker at https://redhat.atlassian.net.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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-robot]

@djoshy: The referenced Jira(s) [CPBUGS-105929] could not be located, all automatically applied jira labels will be removed.

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-105929, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-105929, 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.22.0) matches configured target version for branch (4.22.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-105426 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-105426 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
• bug has dependents

Details

In response to this:

/jira refresh

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.

[djoshy]

/retest-required

[ptalgulk01]

/test unit

[isabella-janssen]

/lgtm
/label backport-risk-assessed

Looks clean

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [djoshy,isabella-janssen]

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

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

[djoshy]

/retest-required

[djoshy]

/retest-required

[ptalgulk01]

● 4.22 vSphere MCO disruptive job URLs:

• disruptive: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive/2087563354641010688
• disruptive-techpreview: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview/2087755010602438656

● 4.22 vSphere longduration job URLs:
  - 1of2: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-tp-longduration-1of2/2087552401908174848
  - 2of2: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-tp-longduration-2of2/2087555681790988288

[djoshy]

/retest-required

[ptalgulk01]

None of the 4 MCO-specific periodic failures appear caused by PR #6397's changes. The PR fixes template scoping and stub ignition upgrade — none of the failing tests exercise those code paths. The ~20 platform failures per job (scc-annotation-checker etc.) are also unrelated. The periodic results look safe for this cherry-pick.

/verified by @ptalgulk01
/label qe-approved

[openshift-ci-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-105929, which is valid.

7 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 POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-105426 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-105426 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
• bug has dependents

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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-robot]

@ptalgulk01: This PR has been marked as verified by @ptalgulk01.

Details

In response to this:

None of the 4 MCO-specific periodic failures appear caused by PR #6397's changes. The PR fixes template scoping and stub ignition upgrade — none of the failing tests exercise those code paths. The ~20 platform failures per job (scc-annotation-checker etc.) are also unrelated. The periodic results look safe for this cherry-pick.

/verified by @ptalgulk01
/label qe-approved

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]

@djoshy: 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-ci-robot]

@djoshy: Jira Issue Verification Checks: Jira Issue OCPBUGS-105929
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-105929 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Manual cherry-pick of #6317 and #6387.

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.

[djoshy]

/cherry-pick release-4.21

[openshift-cherrypick-robot]

@djoshy: #6397 failed to apply on top of branch "release-4.21":

Applying: Adapt vspehere bootimage tests to multi vcenter
Using index info to reconstruct a base tree...
M	test/extended-priv/machineset.go
M	test/extended-priv/mco_bootimages.go
A	test/extended-priv/mco_bootimages_skew.go
M	test/extended-priv/mco_controlplanemachineset.go
M	test/extended-priv/mco_scale.go
A	test/extended-priv/util/vsphere.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended-priv/machineset.go
CONFLICT (content): Merge conflict in test/extended-priv/machineset.go
Auto-merging test/extended-priv/mco_bootimages.go
CONFLICT (content): Merge conflict in test/extended-priv/mco_bootimages.go
CONFLICT (modify/delete): test/extended-priv/mco_bootimages_skew.go deleted in HEAD and modified in Adapt vspehere bootimage tests to multi vcenter.  Version Adapt vspehere bootimage tests to multi vcenter of test/extended-priv/mco_bootimages_skew.go left in tree.
Auto-merging test/extended-priv/mco_controlplanemachineset.go
CONFLICT (content): Merge conflict in test/extended-priv/mco_controlplanemachineset.go
Auto-merging test/extended-priv/mco_scale.go
CONFLICT (content): Merge conflict in test/extended-priv/mco_scale.go
CONFLICT (modify/delete): test/extended-priv/util/vsphere.go deleted in HEAD and modified in Adapt vspehere bootimage tests to multi vcenter.  Version Adapt vspehere bootimage tests to multi vcenter of test/extended-priv/util/vsphere.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adapt vspehere bootimage tests to multi vcenter

Details

In response to this:

/cherry-pick release-4.21

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.