diff --git a/codeserver/ubi9-python-3.12/build-args/konflux.cpu.conf b/codeserver/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/codeserver/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/codeserver/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/jupyter/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf b/jupyter/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/jupyter/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/jupyter/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cuda.conf b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.rocm.conf b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.rocm.conf index cffbf80141..95d743dc52 100644 --- a/jupyter/minimal/ubi9-python-3.12/build-args/konflux.rocm.conf +++ b/jupyter/minimal/ubi9-python-3.12/build-args/konflux.rocm.conf @@ -2,4 +2,4 @@ # ROCm Version : 6.3.4 # Architectures: linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/rocm -BASE_IMAGE=quay.io/aipcc/base-images/rocm:3.0-1755080929 +BASE_IMAGE=registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298 diff --git a/jupyter/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf b/jupyter/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/jupyter/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/jupyter/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/jupyter/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf b/jupyter/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/jupyter/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/jupyter/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/jupyter/rocm/pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf b/jupyter/rocm/pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf index cffbf80141..95d743dc52 100644 --- a/jupyter/rocm/pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf +++ b/jupyter/rocm/pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf @@ -2,4 +2,4 @@ # ROCm Version : 6.3.4 # Architectures: linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/rocm -BASE_IMAGE=quay.io/aipcc/base-images/rocm:3.0-1755080929 +BASE_IMAGE=registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298 diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf b/jupyter/rocm/tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf index cffbf80141..95d743dc52 100644 --- a/jupyter/rocm/tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf +++ b/jupyter/rocm/tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf @@ -2,4 +2,4 @@ # ROCm Version : 6.3.4 # Architectures: linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/rocm -BASE_IMAGE=quay.io/aipcc/base-images/rocm:3.0-1755080929 +BASE_IMAGE=registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298 diff --git a/jupyter/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf b/jupyter/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/jupyter/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/jupyter/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/jupyter/trustyai/ubi9-python-3.12/build-args/konflux.cpu.conf b/jupyter/trustyai/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/jupyter/trustyai/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/jupyter/trustyai/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/rstudio/c9s-python-3.12/build-args/konflux.cpu.conf b/rstudio/c9s-python-3.12/build-args/konflux.cpu.conf index 44f35e9fcd..6982173db3 100644 --- a/rstudio/c9s-python-3.12/build-args/konflux.cpu.conf +++ b/rstudio/c9s-python-3.12/build-args/konflux.cpu.conf @@ -1 +1 @@ -BASE_IMAGE=quay.io/sclorg/python-312-c9s:c9s +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/rstudio/c9s-python-3.12/build-args/konflux.cuda.conf b/rstudio/c9s-python-3.12/build-args/konflux.cuda.conf index ee957f7643..11610026c4 100644 --- a/rstudio/c9s-python-3.12/build-args/konflux.cuda.conf +++ b/rstudio/c9s-python-3.12/build-args/konflux.cuda.conf @@ -1 +1 @@ -BASE_IMAGE=quay.io/opendatahub/odh-base-image-cuda-py312-c9s:v12.8 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/rstudio/rhel9-python-3.12/build-args/konflux.cpu.conf b/rstudio/rhel9-python-3.12/build-args/konflux.cpu.conf index 4af0b8d1a9..78a0e4e312 100644 --- a/rstudio/rhel9-python-3.12/build-args/konflux.cpu.conf +++ b/rstudio/rhel9-python-3.12/build-args/konflux.cpu.conf @@ -1,4 +1,4 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x # Source : https://quay.io/repository/aipcc/base-images/cpu -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.1-1762903336 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/rstudio/rhel9-python-3.12/build-args/konflux.cuda.conf b/rstudio/rhel9-python-3.12/build-args/konflux.cuda.conf index 065bc1be6a..284e0da0f5 100644 --- a/rstudio/rhel9-python-3.12/build-args/konflux.cuda.conf +++ b/rstudio/rhel9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.1-1762903318 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/runtimes/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf b/runtimes/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/runtimes/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/runtimes/datascience/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/runtimes/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf b/runtimes/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf index 8fe9d4edc9..4cbd3b188b 100644 --- a/runtimes/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf +++ b/runtimes/minimal/ubi9-python-3.12/build-args/konflux.cpu.conf @@ -1,3 +1,3 @@ # Base Image : RHEL 9.6 with Python 3.12 # Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x -BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006 diff --git a/runtimes/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf b/runtimes/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/runtimes/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/runtimes/pytorch+llmcompressor/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/runtimes/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf b/runtimes/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/runtimes/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/runtimes/pytorch/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/runtimes/rocm-pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf b/runtimes/rocm-pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf index cffbf80141..95d743dc52 100644 --- a/runtimes/rocm-pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf +++ b/runtimes/rocm-pytorch/ubi9-python-3.12/build-args/konflux.rocm.conf @@ -2,4 +2,4 @@ # ROCm Version : 6.3.4 # Architectures: linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/rocm -BASE_IMAGE=quay.io/aipcc/base-images/rocm:3.0-1755080929 +BASE_IMAGE=registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298 diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf b/runtimes/rocm-tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf index cffbf80141..95d743dc52 100644 --- a/runtimes/rocm-tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf +++ b/runtimes/rocm-tensorflow/ubi9-python-3.12/build-args/konflux.rocm.conf @@ -2,4 +2,4 @@ # ROCm Version : 6.3.4 # Architectures: linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/rocm -BASE_IMAGE=quay.io/aipcc/base-images/rocm:3.0-1755080929 +BASE_IMAGE=registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298 diff --git a/runtimes/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf b/runtimes/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf index 9b62bf6687..284e0da0f5 100644 --- a/runtimes/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf +++ b/runtimes/tensorflow/ubi9-python-3.12/build-args/konflux.cuda.conf @@ -2,4 +2,4 @@ # CUDA Version : 12.8.1 # Architectures: linux/arm64, linux/x86_64 # Source : https://quay.io/repository/aipcc/base-images/cuda -BASE_IMAGE=quay.io/aipcc/base-images/cuda:3.0-1756380241 +BASE_IMAGE=registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347 diff --git a/scripts/update_konflux_args.py b/scripts/update_konflux_args.py new file mode 100755 index 0000000000..45627164ae --- /dev/null +++ b/scripts/update_konflux_args.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python3 + +from __future__ import annotations + +import glob +import pathlib + +from ntb import ROOT_DIR + + +def main() -> None: + for filename in glob.glob("**/build-args/konflux.*.conf", root_dir=ROOT_DIR, recursive=True): + filename = pathlib.Path(ROOT_DIR / filename) + with open(filename, "r") as f: + lines = f.readlines() + + match filename.name: + case "konflux.cpu.conf": + # https://catalog.redhat.com/en/software/containers/rhai/base-image-cpu-rhel9/690377f9d1c73dd1e81192f0?image=693be4e82524d9d966b3c9ef + image = "registry.redhat.io/rhai/base-image-cpu-rhel9:3.2.0-1764872006" + case "konflux.cuda.conf": + # https://catalog.redhat.com/en/software/containers/rhai/base-image-cuda-rhel9/690377f9e1522d6afa972cc6?image=693be55d905e8cd3f800482e + image = "registry.redhat.io/rhai/base-image-cuda-rhel9:3.2.0-1765367347" + case "konflux.rocm.conf": + # https://catalog.redhat.com/en/software/containers/rhai/base-image-rocm-rhel9/690377f9e1522d6afa972cc9?image=693be58457876b3b692e379e + image = "registry.redhat.io/rhai/base-image-rocm-rhel9:3.2.0-1764877298" + case _: + raise ValueError(f"Unknown filename: {filename}") + + new_lines = [] + for line in lines: + if line.startswith("BASE_IMAGE="): + new_lines.append(f"BASE_IMAGE={image}\n") + else: + new_lines.append(line) + + if new_lines != lines: + with open(filename, "wt") as f: + f.writelines(new_lines) + + +if __name__ == "__main__": + main() diff --git a/tests/containers/base_image_test.py b/tests/containers/base_image_test.py index cfc213e76b..a9e87400bb 100644 --- a/tests/containers/base_image_test.py +++ b/tests/containers/base_image_test.py @@ -128,6 +128,9 @@ def check_elf_file(): continue # it's in ${MPI_HOME}/lib if deps.startswith("liboshmem.so"): continue # it's in ${MPI_HOME}/lib + # AIPCC-8057: Unsatisfied library dependencies on libnvidia-ml.so in the cuda aipcc image + if deps.startswith("libnvidia-ml.so"): + continue # it does not seem to be in the image with subtests.test(f"{dlib=}"): pytest.fail(f"{dlib=} has unsatisfied dependencies {deps=}")