Merge pull request #1675 from atheo89/revert-indexes

RHAIENG-495: revert "Lock rocm and cuda minimal packages from internal aipcc index and set it available on runtime"

Author: atheo89

Makefile

@@ -517,27 +517,3 @@ test:
 	@echo "Running quick static tests"
 	uv run pytest -m 'not buildonlytest'
 	@./scripts/check_dockerfile_alignment.sh
-
-
-#This is temporary lock on the final implementation that will covers all the folders should apply smart logic for the locks
-CPU_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cpu-ubi9/simple/
-CUDA_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cuda-ubi9/simple/
-ROCM_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/rocm-ubi9/simple/
-
-lock-cuda:
-	uv pip compile \
-		--python-platform=linux \
-		jupyter/minimal/ubi9-python-3.12/pyproject.toml \
-		--index-url=$(CUDA_INDEX) \
-		--output-file=jupyter/minimal/ubi9-python-3.12/uv.lock/pylock.cuda.toml \
-		--python-version=3.12
-
-
-lock-rocm:
-	uv pip compile \
-		--python-platform=linux \
-		jupyter/minimal/ubi9-python-3.12/pyproject.toml \
-		--index-url=$(ROCM_INDEX) \
-		--output-file=jupyter/minimal/ubi9-python-3.12/uv.lock/pylock.rocm.toml \
-		--python-version=3.12
-

jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cuda

@@ -79,16 +79,13 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
 
 USER 1001
 
-COPY ${MINIMAL_SOURCE_CODE}/uv.lock/pylock.cuda.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
-
-# Makes available the internal python package index from aipcc on the container runtime
-COPY ${MINIMAL_SOURCE_CODE}/cuda-pip.conf /etc/pip.conf
+COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
 
 # Install Python dependencies from requirements.txt file
 RUN echo "Installing softwares and packages" && \
     # This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
     #  we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
-    uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.cuda.toml && \
+    uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
     # Disable announcement plugin of jupyterlab \
     jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
     # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.rocm

@@ -67,16 +67,13 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
 
 USER 1001
 
-COPY ${MINIMAL_SOURCE_CODE}/uv.lock/pylock.rocm.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
-
-# Makes available the internal python package index from aipcc on the container runtime
-COPY ${MINIMAL_SOURCE_CODE}/rocm-pip.conf /etc/pip.conf
+COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
 
 # Install Python dependencies from Pipfile.lock file
 RUN echo "Installing softwares and packages" && \
     # This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
     #  we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
-    uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.rocm.toml && \
+    uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
     # Disable announcement plugin of jupyterlab \
     jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
     # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \