Merge pull request #754 from fontivan/sskeard/cnf-20367-cnf-18836-images-overhaul-fix-3

CNF-20367 / CNF-18836: Align on changes to telco5g-konflux

Author: fontivan

.konflux/container_build_args.conf

@@ -5,11 +5,11 @@ KONFLUX=true
 # The builder image is used to compile the code
 # This should match the varsFromImage in the rpms.build.in.yaml file
 # Mintmaker should keep these in sync automatically when it performs updates
-BUILDER_IMAGE=registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+BUILDER_IMAGE=registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
 #
 
 # The runtime image is used to run the binaries
 # This should match the varsFromImage in the rpms.runtime.in.yaml file
 # Mintmaker should keep these in sync automatically when it performs updates
-RUNTIME_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
+RUNTIME_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
 #

.konflux/lock-build/rpms.in.yaml

@@ -20,7 +20,7 @@ contentOrigin:
       priority: 1
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
     - repoid: ubi-9-for-$basearch-baseos-rpms
       name: Red Hat Universal Base Image 9 for $basearch - BaseOS (RPMs)
@@ -35,7 +35,7 @@ contentOrigin:
       priority: 1
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
     - repoid: codeready-builder-for-ubi-9-$basearch-rpms
       name: Red Hat CodeReady Linux Builder for UBI 9 $basearch (RPMs)
@@ -50,7 +50,7 @@ contentOrigin:
       priority: 1
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
     # RHEL repos are required for some packages
     - repoid: rhel-9-for-$basearch-appstream-rpms
@@ -72,7 +72,7 @@ contentOrigin:
       priority: 2
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
     - repoid: rhel-9-for-$basearch-baseos-rpms
       name: Red Hat Enterprise Linux 9 for $basearch - BaseOS (RPMs)
@@ -93,7 +93,7 @@ contentOrigin:
       priority: 2
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
     - repoid: codeready-builder-for-rhel-9-$basearch-rpms
       name: Red Hat CodeReady Linux Builder for RHEL 9 $basearch (RPMs)
@@ -114,7 +114,7 @@ contentOrigin:
       priority: 2
       # This should match the BUILDER_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
+      varsFromImage: registry.access.redhat.com/ubi9/ubi:latest@sha256:dcd8128d7620b06e4bce291f30db6ffcfa339b04e6d66081e36eb8e2b1b700f8
       #
 packages:
   - rust-toolset

.konflux/lock-runtime/rpms.in.yaml

@@ -18,7 +18,7 @@ contentOrigin:
       enabled_metadata: "1"
       # This should match the RUNTIME_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
+      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
       #
     - repoid: ubi-9-for-$basearch-baseos-rpms
       name: Red Hat Universal Base Image 9 for $basearch - BaseOS (RPMs)
@@ -32,7 +32,7 @@ contentOrigin:
       enabled_metadata: "1"
       # This should match the RUNTIME_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
+      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
       #
     - repoid: codeready-builder-for-ubi-9-$basearch-rpms
       name: Red Hat CodeReady Linux Builder for UBI 9 $basearch (RPMs)
@@ -46,7 +46,7 @@ contentOrigin:
       enabled_metadata: "1"
       # This should match the RUNTIME_IMAGE in container_build_args.conf
       # Mintmaker should keep these in sync automatically when it performs updates
-      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
+      varsFromImage: registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:61d5ad475048c2e655cd46d0a55dfeaec182cc3faa6348cb85989a7c9e196483
       #
 packages:
   - openssh-clients

Makefile

@@ -23,10 +23,6 @@ RHEL9_ORG_ID ?= ""
 # This can be set from the command line if the default is not correct for your environment.
 REGISTRY_AUTH_FILE ?= $(shell echo $${XDG_RUNTIME_DIR:-/run/user/$$(id -u)})/containers/auth.json
 
-# RHEL9_RELEASE defines the RHEL9 release version to update the rpm lock file for the runtime
-# This is automatically extracted from the Containerfile
-RHEL9_RELEASE ?= $(shell awk -F'[=:@]' '/^BUILDER_IMAGE=registry\.redhat\.io\/rhel9.*-els\/rhel:/ {print $$3}' $(PROJECT_DIR)/.konflux/container_build_args.conf)
-
 # YAMLLINT_VERSION defines the yamllint version to download from GitHub releases.
 YAMLLINT_VERSION ?= 1.35.1
 
@@ -102,7 +98,6 @@ konflux-update-rpm-lock-build: sync-git-submodules ## Update the rpm lock file f
 		LOCK_SCRIPT_TARGET_DIR=$(PROJECT_DIR)/.konflux/lock-build/tmp/ \
 		RHEL9_EXECUTION_IMAGE=$$(awk -F'=' '/^BUILDER_IMAGE=/ {print $$2}' $(PROJECT_DIR)/.konflux/container_build_args.conf | sed 's|@.*||') \
 		RHEL9_IMAGE_TO_LOCK=$$(awk -F'=' '/^BUILDER_IMAGE=/ {print $$2}' $(PROJECT_DIR)/.konflux/container_build_args.conf) \
-		RHEL9_RELEASE=$(RHEL9_RELEASE) \
 		RHEL9_ACTIVATION_KEY=$(RHEL9_ACTIVATION_KEY) \
 		RHEL9_ORG_ID=$(RHEL9_ORG_ID) \
 		REGISTRY_AUTH_FILE=$(REGISTRY_AUTH_FILE) \