[release-4.15] OCPBUGS-38003: Reload host inventory on conflict

[openshift-cherrypick-robot]

This is an automated cherry-pick of #881

/assign zaneb

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-37167 has been cloned as Jira Issue OCPBUGS-38003. Will retitle bug to link to clone. /retitle [release-4.15] OCPBUGS-38003: Reload host inventory on conflict

In response to [this](https://github.com/openshift/assisted-installer/pull/891): >This is an automated cherry-pick of #881 > >/assign zaneb Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-installer). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-38003, which is invalid:

• expected dependent Jira Issue OCPBUGS-37167 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

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](https://github.com/openshift/assisted-installer/pull/891): >This is an automated cherry-pick of #881 > >/assign zaneb Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-installer). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[openshift-ci[bot]]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).

[pawanpinjarkar]

/jira refresh

[openshift-ci-robot]

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-38003, 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.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) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-37167](https://issues.redhat.com//browse/OCPBUGS-37167) is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-37167](https://issues.redhat.com//browse/OCPBUGS-37167) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @mhanss

In response to [this](https://github.com/openshift/assisted-installer/pull/891#issuecomment-2313422260): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-installer). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[zaneb]

/jira refresh

[openshift-ci-robot]

@zaneb: This pull request references Jira Issue OCPBUGS-38003, which is valid.

7 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 POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-37167](https://issues.redhat.com//browse/OCPBUGS-37167) is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-37167](https://issues.redhat.com//browse/OCPBUGS-37167) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @mhanss

In response to [this](https://github.com/openshift/assisted-installer/pull/891#issuecomment-2313422709): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-installer). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[pawanpinjarkar]

/approve

[pawanpinjarkar]

/lgtm

[zaneb]

/label backport-risk-assessed /assign @eranco74 /cherry-pick release-4.14

[openshift-cherrypick-robot]

@zaneb: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/assisted-installer/pull/891#issuecomment-2313491121): >/label backport-risk-assessed >/assign @eranco74 >/cherry-pick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

[eranco74]

/approve

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eranco74, openshift-cherrypick-robot, pawanpinjarkar

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](https://github.com/openshift/assisted-installer/blob/release-4.15/OWNERS)~~ [eranco74] 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]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-38003: All pull requests linked via external trackers have merged:

• openshift/assisted-installer#891

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

In response to [this](https://github.com/openshift/assisted-installer/pull/891): >This is an automated cherry-pick of #881 > >/assign zaneb Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-installer). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[openshift-cherrypick-robot]

@zaneb: #891 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-36779: Reload host inventory on conflict
Using index info to reconstruct a base tree...
M   src/installer/installer.go
Falling back to patching base and 3-way merge...
Auto-merging src/installer/installer.go
CONFLICT (content): Merge conflict in src/installer/installer.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 OCPBUGS-36779: Reload host inventory on conflict
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](https://github.com/openshift/assisted-installer/pull/891#issuecomment-2313491121): >/label backport-risk-assessed >/assign @eranco74 >/cherry-pick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-csr-approver This PR has been included in build ose-agent-installer-csr-approver-container-v4.15.0-202409230935.p0.gbc16edd.assembly.stream.el8. All builds following this will include this PR.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-orchestrator This PR has been included in build ose-agent-installer-orchestrator-container-v4.15.0-202409230935.p0.gbc16edd.assembly.stream.el8. All builds following this will include this PR.