To build node image, we currently include repos based on id as per:
|
conditional-include: |
|
- if: id == "rhel" |
|
include: |
|
repos: |
|
- rhel-9.6-baseos |
|
- rhel-9.6-appstream |
|
- rhel-9.6-early-kernel |
|
- rhel-9.6-fast-datapath |
|
- rhel-9.6-server-ose-4.19 |
|
- if: id == "centos" |
|
include: |
|
repos: |
|
- c9s-baseos |
|
- c9s-appstream |
|
- c9s-sig-nfv |
|
- c9s-sig-cloud-okd |
|
# XXX: this shouldn't be here; see related XXX in Containerfile |
|
- rhel-9.6-server-ose-4.19-okd |
and the value is passed with:
|
rpm-ostree experimental compose treefile-apply \ |
|
--var id=$ID /run/src/packages-openshift.yaml |
itself based on :
We would need to use the env var VERSION_ID as condition as well in order to be able to build for EL10 with the right repos.
Based on this commit message coreos/rpm-ostree@99aff16 @jlebon tempted to implement --var-from-os-release as parameter when using treefile-apply, but decided to go with current solution to get #1498 merged quickly.
I think implementing --var-from-os-release should be the way to go for long-term solution.
For short-term, maybe we should pass the required values in id var as per: --var id="${ID}_${VERSION_ID}", and edit the conditional-include list by adding the rhel_9, rhel_10, centos_9 and centos_10 entries.
What are your thoughts on this ?
To build node image, we currently include repos based on
idas per:os/packages-openshift.yaml
Lines 7 to 24 in 9b587eb
and the value is passed with:
os/build-node-image.sh
Lines 37 to 38 in 9b587eb
itself based on :
os/build-node-image.sh
Line 20 in 9b587eb
We would need to use the env var
VERSION_IDas condition as well in order to be able to build for EL10 with the right repos.Based on this commit message coreos/rpm-ostree@99aff16 @jlebon tempted to implement
--var-from-os-releaseas parameter when usingtreefile-apply, but decided to go with current solution to get #1498 merged quickly.I think implementing
--var-from-os-releaseshould be the way to go for long-term solution.For short-term, maybe we should pass the required values in
idvar as per:--var id="${ID}_${VERSION_ID}", and edit theconditional-includelist by adding therhel_9,rhel_10,centos_9andcentos_10entries.What are your thoughts on this ?