[release-4.15] OCPBUGS-30922: coreos-installer iso kargs show broken on Agent ISO

[andfasano]

This patch is a manual cherry-pick of commits 6748cdd (OCPBUGS-14257) and d3ffa4f (OCPBUGS-28827)

See #7896 and #7972

[openshift-ci-robot]

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

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-14257 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-14257 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @mhanss

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

In response to this:

This patch is a manual cherry-pick of commits 6748cdd (OCPBUGS-14257) and d3ffa4f (OCPBUGS-28827)

See #7896 and #7972

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]

@andfasano: 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-gcp-ovn-upgrade	946eab0	link	false	/test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-vsphere	946eab0	link	false	/test okd-scos-e2e-vsphere
ci/prow/okd-scos-e2e-gcp	946eab0	link	false	/test okd-scos-e2e-gcp

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.

[zaneb]

/approve
/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zaneb

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:

• pkg/asset/agent/OWNERS [zaneb]

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

[mhanss]

/label cherry-pick-approved

[bfournie]

/lgtm

[openshift-ci-robot]

@andfasano: Jira Issue OCPBUGS-30922: All pull requests linked via external trackers have merged:

• openshift/installer#8163

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

In response to this:

This patch is a manual cherry-pick of commits 6748cdd (OCPBUGS-14257) and d3ffa4f (OCPBUGS-28827)

See #7896 and #7972

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

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-installer-altinfra-container-v4.15.0-202403281447.p0.ga947c0b.assembly.stream.el8 for distgit ose-installer-altinfra.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2024-03-29-020512

[andfasano]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@andfasano: new pull request created: #8228

In response to this:

/cherry-pick release-4.14

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.

[andfasano]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

@andfasano: #8163 failed to apply on top of branch "release-4.13":

Applying: manual cherry-pick of commits 6748cdd1780de2987b21a06eeef418b7ddedc92f (OCPBUGS-14257) and d3ffa4f6e9c6135240fdb73b645f1cb55dfae2d0 (OCPBUGS-28827)
Using index info to reconstruct a base tree...
M	pkg/asset/agent/image/agentimage.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/image/agentimage.go
CONFLICT (content): Merge conflict in pkg/asset/agent/image/agentimage.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 manual cherry-pick of commits 6748cdd1780de2987b21a06eeef418b7ddedc92f (OCPBUGS-14257) and d3ffa4f6e9c6135240fdb73b645f1cb55dfae2d0 (OCPBUGS-28827)
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:

/cherry-pick release-4.13

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.