MGMT-24419: Don't try to get the DataImage after ICI's installation completes#80991
MGMT-24419: Don't try to get the DataImage after ICI's installation completes#80991giladravid16 wants to merge 1 commit into
Conversation
|
@giladravid16: This pull request references MGMT-24419 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target either version "5.0." or "openshift-5.0.", but it targets "ACM 5.0" instead. DetailsIn response to this: 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. |
|
Skipping CI for Draft Pull Request. |
WalkthroughTwo CI gather scripts for the image-based install operator are updated: the gather script swaps ChangesImage-Based Install Operator Gather Script Updates
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
/testwith openshift/image-based-install-operator/main/e2e-ibio openshift/image-based-install-operator#844 |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh`:
- Around line 29-30: The post-gather script writes imageclusterinstall.yaml to
HUB_DIR, which can miss export and may land in the wrong place if HUB_DIR is
unset. Update the image-based-install-operator post/gather command in
image-based-install-operator-post-gather-commands.sh to write the
imageclusterinstall.yaml artifact into ARTIFACT_DIR instead, using the same
artifact-handling pattern as the other collected files so it is included in the
archived results.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 02a46a1e-f8f5-4919-94dd-7bfcfa209d29
📒 Files selected for processing (2)
ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.shci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh
💤 Files with no reviewable changes (1)
- ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.sh
| # in case of an error in deleting the imageclusterinstall, we want to see it | ||
| oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/imageclusterinstall.yaml || true |
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Write imageclusterinstall.yaml to ${ARTIFACT_DIR} so it is exported.
On Line 30, output goes to ${HUB_DIR}, but Line 36 only tars /ibio-post-gather. This can drop the new artifact from collected results (and if HUB_DIR is unset in this shell, it may write to /imageclusterinstall.yaml).
Suggested fix
-oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/imageclusterinstall.yaml || true
+oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${ARTIFACT_DIR}/imageclusterinstall.yaml || true📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| # in case of an error in deleting the imageclusterinstall, we want to see it | |
| oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/imageclusterinstall.yaml || true | |
| oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${ARTIFACT_DIR}/imageclusterinstall.yaml || true |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh`
around lines 29 - 30, The post-gather script writes imageclusterinstall.yaml to
HUB_DIR, which can miss export and may land in the wrong place if HUB_DIR is
unset. Update the image-based-install-operator post/gather command in
image-based-install-operator-post-gather-commands.sh to write the
imageclusterinstall.yaml artifact into ARTIFACT_DIR instead, using the same
artifact-handling pattern as the other collected files so it is included in the
archived results.
|
[REHEARSALNOTIFIER]
A total of 52 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: giladravid16 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/testwith openshift/image-based-install-operator/main/e2e-ibio openshift/image-based-install-operator#844 #80991 |
|
/pj-rehearse pull-ci-openshift-image-based-install-operator-main-e2e-ibio |
|
@giladravid16: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@giladravid16: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Summary by CodeRabbit
This PR updates the image-based install operator CI gather behavior in OpenShift CI.
Practically, it changes the post-install artifact collection to stop trying to retrieve the DataImage after installation completes. Instead, the gather step now captures
baremetalhost.yamlfrom theopenshift-machine-apinamespace, while also trimming unnecessary host-side collection work such as mounting/dev/sr0and archiving/mnt/config-iso.It also adds a best-effort fetch of the
imageclusterinstallresource foribi-clusterintoimageclusterinstall.yaml, so that resource is still surfaced even if cleanup of the install object fails.