OCPBUGS-52164: Add the generation of initrd.addrsize and generic.ins file for ABI Day2 Artifacts #2007
Conversation
Neeraj8418
changed the title
|
/retest |
pkg/cli/admin/nodeimage/create.go
Outdated
| @@ -381,7 +381,8 @@ func (o *CreateOptions) copyArtifactsFromNodeJoinerPod() error { | |||
| } | |||
| if o.GeneratePXEFiles { | |||
| rsyncOptions.Source.Path = "/assets/boot-artifacts/" | |||
| rsyncOptions.RsyncInclude = []string{"*.img", "*.*vmlinuz", "*.ipxe"} | |||
| rsyncOptions.RsyncInclude = nil | |||
| rsyncOptions.RsyncExclude = []string{".*"} | |||
There was a problem hiding this comment.
Also commented in the other thread, but this seems to gather too much stuff (as previously fixed in #1931), did you maybe verify it? Thanks cc @Neeraj8418
There was a problem hiding this comment.
Hi @andfasano , I just verified for s390x and that only copied the required images. No additional stuff were added.
[root@m42lp51 day2]# ll
total 1079148
-rw-r--r--. 1 root root 149 Apr 15 14:23 node.s390x-generic.ins
-rw-r--r--. 1 root root 16 Apr 15 14:23 node.s390x-initrd.addrsize
-rw-r--r--. 1 root root 64771460 Apr 15 14:23 node.s390x-initrd.img
-rw-r--r--. 1 root root 9253349 Apr 15 14:23 node.s390x-kernel.img
-rw-r--r--. 1 root root 1031003648 Apr 15 14:23 node.s390x-rootfs.img
-rw-r--r--. 1 root root 712 Apr 14 16:32 nodes-config.yaml
Does this looks fine or shall i revert it back to previous changes?
There was a problem hiding this comment.
I'd feel more comfortable into having an explicit list of files (extensions) to be included, rather than an exclusion list that may catch in future unwanted files.
There was a problem hiding this comment.
Ok sure @andfasano . I have forced pushed the changed to first commit now. This branch has an explicit list of files to be included.
There was a problem hiding this comment.
Personally I'd feel more comfortable knowing that we can change the installer in future, but OCPBUGS-45311 doesn't specify what extra files were previously being added so it is hard to evaluate, and we have already messed Neeraj around enough, so I LGTMd.
|
/retest |
1 similar comment
|
/retest |
Neeraj8418
force-pushed
the
abi-day2-artifacts
branch
from
442f367 to
3cce51a
Compare
|
/retest |
|
/approve |
|
/retest |
3 similar comments
|
/retest |
|
/retest |
|
/retest |
|
/jira-refresh |
|
/retest |
2 similar comments
|
/retest |
|
/retest |
|
/retitle OCPBUGS-52164: Add the generation of initrd.addrsize and generic.ins file for ABI Day2 Artifacts |
openshift-ci
bot
changed the title
openshift-ci-robot
added
jira/severity-moderate
|
@Neeraj8418: This pull request references Jira Issue OCPBUGS-52164, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In 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. |
openshift-ci-robot
added
the
jira/valid-bug
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: andfasano, Neeraj8418, 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:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/retest |
|
/pj-rehearse ack |
|
/retest-required |
1 similar comment
|
/retest-required |
|
/retest |
|
@Neeraj8418: all tests passed! 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. |
|
@Neeraj8418: Jira Issue OCPBUGS-52164: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-52164 has been moved to the MODIFIED state. In 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. |
|
[ART PR BUILD NOTIFIER] Distgit: openshift-enterprise-cli |
|
[ART PR BUILD NOTIFIER] Distgit: ose-tools |
|
[ART PR BUILD NOTIFIER] Distgit: openshift-enterprise-deployer |
|
[ART PR BUILD NOTIFIER] Distgit: ose-cli-artifacts |
|
Fix included in accepted release 4.19.0-0.nightly-2025-04-29-095709 |
This PR introduces a conditional filter to include .ins and .addrsize PXE artifacts only when the target CPU architecture is s390x during ABI-based Day-2 node image creation using oc adm node-image create.
Changes:
Updated the create.go logic to check for s390x CPU architecture before including:
*.ins
*.addrsize
Testing
Tested by:
Running the oc adm node-image create for s390x and verified only s390x-relevant PXE files are generated.
Ensured no regression on other platforms — .ins and .addrsize are excluded when architecture is not s390x.