-
Notifications
You must be signed in to change notification settings - Fork 115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RHELAI-473: Adding rhel ai version #665
Conversation
This strikes me as a change we should add downstream as a new containerfile or a patch rather than here in the upstream, but not entirely sure. cc @fabiendupont @lmilbaum |
Just found your comment in slack, the above is resolved by this but going to post it here for posterity:
|
The OS can be something else than RHEL, so not sure that |
@fabiendupont do we have some more generic name for it? |
@Gregory-Pereira i think setting git hash in upstream or provide the way for dev to setup their own versioning can be helpful too and in downstream we will set release versions |
b96ea42
to
2a61260
Compare
I agree this should be done downstream, not upstream. |
1f521d0
to
f2515e9
Compare
Currently downstream uses upstream containerfile. I added verification that it is rhel image in order to set this field only for rhel |
f2515e9
to
46c7c8e
Compare
/hold till we will decide which exact var we should change in /etc/os-release |
/hold |
Set github hash by defautl as image version. Add RHEL_AI_VERSION into /etc/os-release in order to use it in insights Signed-off-by: Igal Tsoiref <[email protected]>
/unhold |
46c7c8e
to
e7bd5e3
Compare
@@ -146,6 +148,9 @@ RUN mv /etc/selinux /etc/selinux.tmp \ | |||
# Install rhc connect for insights telemetry gathering | |||
&& . /etc/os-release && if [ "${ID}" == "rhel" ]; then \ | |||
dnf install -y rhc rhc-worker-playbook; \ | |||
sed -i -e "/^VARIANT=/ {s/^VARIANT=.*/VARIANT=\"RHEL AI\"/; t}" -e "\$aVARIANT=\"RHEL AI\"\"" /etc/os-release; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
amd, intel?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do in next PR, in anycase GA is nvidia.
Joining late to the party. What does this variable used for? If we agree that it is needed, should it be populated via a builds arg file? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving this PR to unblock @tsorya from implementing the logic on the insights side. A greater effort is required which will probably change some of the bits contributed by this PR. Filing a Jira issue for the greater effort.
Adding rhel ai version
Set github hash by defautl as image version.
Add RHEL AI as variant into /etc/os-release in order to use it in insights
NAME="Red Hat Enterprise Linux"
VERSION="9.20240630.0.4 (Plow)"
ID="rhel"
ID_LIKE="fedora"
VERSION_ID="9.4"
PLATFORM_ID="platform:el9"
PRETTY_NAME="Red Hat Enterprise Linux 9.20240630.0.4 (Plow)"
ANSI_COLOR="0;31"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos"
HOME_URL="https://www.redhat.com/"
DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9"
BUG_REPORT_URL="https://bugzilla.redhat.com/"
REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
REDHAT_BUGZILLA_PRODUCT_VERSION=9.4
REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
REDHAT_SUPPORT_PRODUCT_VERSION="9.4"
OSTREE_VERSION='9.20240630.0'
VARIANT_ID=rhel_ai1
VARIANT="RHEL AI"
BUILD_ID='v1.1.3'