From 9d175ab5d905e4b7ead399f4ad3e0498df0d4842 Mon Sep 17 00:00:00 2001
From: Igal Tsoiref <itsoiref@redhat.com>
Date: Wed, 17 Jul 2024 12:30:00 +0300
Subject: [PATCH] Changing os-release file parameter from BUILD_ID to
 RHEL_AI_VERSION_ID as it matches much better. Changing the way we set
 image_version_id label, in order for it to work in konflux we should use
 LABEL in container file

Signed-off-by: Igal Tsoiref <itsoiref@redhat.com>
---
 training/common/Makefile.common     | 2 +-
 training/nvidia-bootc/Containerfile | 6 ++++--
 training/nvidia-bootc/Makefile      | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/training/common/Makefile.common b/training/common/Makefile.common
index 195038ff..f4c3115a 100644
--- a/training/common/Makefile.common
+++ b/training/common/Makefile.common
@@ -17,7 +17,7 @@ CONTAINER_TOOL_EXTRA_ARGS ?=
 EXTRA_RPM_PACKAGES ?=
 GRAPH_ROOT=$(shell podman info --format '{{ .Store.GraphRoot }}')
 UMASK=$(shell umask)
-IMAGE_VERSION := $(or ${IMAGE_VERSION},$(shell git rev-parse --short HEAD))
+IMAGE_VERSION_ID := $(or ${IMAGE_VERSION_ID},$(shell git rev-parse --short HEAD))
 
 AUTH_JSON ?=
 
diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile
index faafc2a3..438394c8 100644
--- a/training/nvidia-bootc/Containerfile
+++ b/training/nvidia-bootc/Containerfile
@@ -102,7 +102,7 @@ COPY --from=builder --chmod=444 /home/builder/yum-packaging-precompiled-kmod/tmp
 # Temporary workaround until the permanent fix for libdnf is merged
 COPY nvidia-toolkit-firstboot.service /usr/lib/systemd/system/nvidia-toolkit-firstboot.service
 
-ARG IMAGE_VERSION
+ARG IMAGE_VERSION_ID
 
 # TODO: rework this monstrosity into a build.sh (or even not shell script)
 # The need for the `cp /etc/dnf/dnf.conf` is a workaround for https://github.com/containers/bootc/issues/637
@@ -153,7 +153,7 @@ RUN mv /etc/selinux /etc/selinux.tmp \
         dnf install -y rhc rhc-worker-playbook; \
         sed -i -e "/^VARIANT=/ {s/^VARIANT=.*/VARIANT=\"RHEL AI\"/; t}" -e "\$aVARIANT=\"RHEL AI\"" /usr/lib/os-release; \
         sed -i -e "/^VARIANT_ID=/ {s/^VARIANT_ID=.*/VARIANT_ID=rhel_ai/; t}" -e "\$aVARIANT_ID=rhel_ai" /usr/lib/os-release; \
-        sed -i -e "/^BUILD_ID=/ {s/^BUILD_ID=.*/BUILD_ID='${IMAGE_VERSION}'/; t}" -e "\$aBUILD_ID='${IMAGE_VERSION}'" /usr/lib/os-release; \
+        sed -i -e "/^RHEL_AI_VERSION_ID=/ {s/^RHEL_AI_VERSION_ID=.*/RHEL_AI_VERSION_ID='${IMAGE_VERSION_ID}'/; t}" -e "\$aRHEL_AI_VERSION_ID='${IMAGE_VERSION_ID}'" /usr/lib/os-release; \
         fi \
     && dnf clean all \
     && ln -s ../cloud-init.target /usr/lib/systemd/system/default.target.wants \
@@ -212,3 +212,5 @@ RUN --mount=type=secret,id=instructlab-nvidia-pull/.dockerconfigjson \
          IID=$(sudo podman --root /usr/lib/containers/storage pull ${INSTRUCTLAB_IMAGE}); \
     fi
 RUN podman system reset --force 2>/dev/null
+
+LABEL image_version_id="${IMAGE_VERSION_ID}"
diff --git a/training/nvidia-bootc/Makefile b/training/nvidia-bootc/Makefile
index 57ee8683..28428467 100644
--- a/training/nvidia-bootc/Makefile
+++ b/training/nvidia-bootc/Makefile
@@ -16,8 +16,7 @@ bootc: driver-toolkit check-sshkey prepare-files
 		$(DRIVER_TOOLKIT_IMAGE:%=--build-arg DRIVER_TOOLKIT_IMAGE=%) \
 		$(DRIVER_VERSION:%=--build-arg DRIVER_VERSION=%) \
 		$(DRIVER_VERSION:%=--label driver-version=%) \
-		$(IMAGE_VERSION:%=--label image_version=%) \
-		$(IMAGE_VERSION:%=--build-arg IMAGE_VERSION=%) \
+		$(IMAGE_VERSION_ID:%=--build-arg IMAGE_VERSION_ID=%) \
 		$(EXTRA_RPM_PACKAGES:%=--build-arg EXTRA_RPM_PACKAGES=%) \
 		$(FROM:%=--build-arg BASEIMAGE=%) \
 		$(INSTRUCTLAB_IMAGE:%=--build-arg INSTRUCTLAB_IMAGE=%) \