OCPBUGS-60559: Update the OnClusterBuild payload tests to reflect the validation rule requiring MCP & MOSC names to match

[isabella-janssen]

Closes: OCPBUGS-60559

- What I did
Update the MOSC-related functions in the test/extended/ directory to take in one parameter representing both the MOSC and MCP names to align with the API validation introduced in openshift/api#2399 requiring the names to be identical.

- How to verify it
The on-cluster image mode tests in the MCO disruptive test suite should not fail with the following error.

MachineOSConfig name must match the referenced MachineConfigPool name; can only have one MachineOSConfig per MachineConfigPool

- Description for the changelog
OCPBUGS-60559: Update the OnClusterBuild tests to reflect validation rule requiring the MOSC and MCP names to match

[openshift-ci]

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

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive-techpreview

Running this in just one platform first to see if this idea does solve the issue @RishabhSaini was seeing in runs on openshift/origin#29741.

[openshift-ci]

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

• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/3adae740-79ed-11f0-8715-4dfae806356e-0

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-60559, which is invalid:

• expected the bug to target the "4.20.0" version, but no target version was set

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.

In response to this:

- What I did

- How to verify it

- Description for the changelog

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]

/jira refresh

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-60559, 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.20.0) matches configured target version for branch (4.20.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

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.

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive-techpreview

[openshift-ci]

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

• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/82884fa0-7a02-11f0-9cc6-fc2d877b48a3-0

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-60559, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.0) matches configured target version for branch (4.20.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

Closes: OCPBUGS-60559

- What I did
This updates the MOSC-related functions in the test/extended/ directory to take in one parameter representing both the MOSC and MCP names to align with the API validation introduced in openshift/api#2399 requiring the names to be identical.

- How to verify it
The on-cluster image mode tests in the MCO disruptive test suite should not fail with the following error.

MachineOSConfig name must match the referenced MachineConfigPool name; can only have one MachineOSConfig per MachineConfigPool

- Description for the changelog
OCPBUGS-60559: Update the OnClusterBuild tests to reflect validation rule requiring the MOSC and MCP names to match

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]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-azure-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-gcp-mco-disruptive

[openshift-ci]

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

• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-azure-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-gcp-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/661b7cf0-7c2f-11f0-9463-4ccb4ea76608-0

[umohnani8]

/lgtm

[isabella-janssen]

/hold

Holding for a moment to look at the payload results.

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

[openshift-ci]

@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.20-periodics-e2e-vsphere-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/30962800-7d2e-11f0-88fb-82cc4c4bc4a4-0

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

[openshift-ci]

@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.20-periodics-e2e-vsphere-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/95428300-7d5d-11f0-897a-5bee0aea11d9-0

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

[openshift-ci]

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

• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/4943af80-7dc4-11f0-9f2b-ecd808670970-0

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-vsphere-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

[openshift-ci]

@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.20-periodics-e2e-vsphere-mco-disruptive
• periodic-ci-openshift-machine-config-operator-release-4.20-periodics-e2e-aws-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/44ef73c0-7dc8-11f0-9358-883f47a727b9-0

[isabella-janssen]

/unhold

Looks like the payload failures are unrelated & will be addressed in OCPBUGS-60683.

[RishabhSaini]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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]

/retest-required

Remaining retests: 0 against base HEAD 03a3677 and 2 for PR HEAD ddc2cdb in total

[isabella-janssen]

/retest-required

[openshift-ci]

@isabella-janssen: 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/e2e-azure-ovn-upgrade-out-of-change	ddc2cdb	link	false	/test e2e-azure-ovn-upgrade-out-of-change
ci/prow/bootstrap-unit	ddc2cdb	link	false	/test bootstrap-unit
ci/prow/e2e-agent-compact-ipv4	ddc2cdb	link	false	/test e2e-agent-compact-ipv4
ci/prow/e2e-aws-mco-disruptive	ddc2cdb	link	false	/test e2e-aws-mco-disruptive
ci/prow/e2e-gcp-mco-disruptive	ddc2cdb	link	false	/test e2e-gcp-mco-disruptive
ci/prow/e2e-gcp-op-ocl	ddc2cdb	link	false	/test e2e-gcp-op-ocl

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

[openshift-ci-robot]

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

• openshift/machine-config-operator#5249

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

In response to this:

Closes: OCPBUGS-60559

- What I did
Update the MOSC-related functions in the test/extended/ directory to take in one parameter representing both the MOSC and MCP names to align with the API validation introduced in openshift/api#2399 requiring the names to be identical.

- How to verify it
The on-cluster image mode tests in the MCO disruptive test suite should not fail with the following error.

MachineOSConfig name must match the referenced MachineConfigPool name; can only have one MachineOSConfig per MachineConfigPool

- Description for the changelog
OCPBUGS-60559: Update the OnClusterBuild tests to reflect validation rule requiring the MOSC and MCP names to match

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.

[umohnani8]

We should backport this as we are backporting the API validation also openshift/api#2449

/cherry-pick release-4.19

[openshift-cherrypick-robot]

@umohnani8: #5249 failed to apply on top of branch "release-4.19":

Applying: tests: update OnClusterBuild tests to have MOSC and MCPs with matching names
Using index info to reconstruct a base tree...
M	test/extended/machineosconfig.go
M	test/extended/mco_ocb.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended/mco_ocb.go
CONFLICT (content): Merge conflict in test/extended/mco_ocb.go
Auto-merging test/extended/machineosconfig.go
CONFLICT (content): Merge conflict in test/extended/machineosconfig.go
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 advice.mergeConflict false"
Patch failed at 0001 tests: update OnClusterBuild tests to have MOSC and MCPs with matching names

In response to this:

We should backport this as we are backporting the API validation also openshift/api#2449

/cherry-pick release-4.19

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.