Update Dockerfile and Tekton to use requirements.<flavor>.txt

Align with the renamed requirements file (requirements.cpu.txt):
- Dockerfile.cpu: COPY requirements.${PYLOCK_FLAVOR}.txt as requirements.txt
  (in both whl-cache and codeserver stages)
- Dockerfile.vath: same COPY update
- Tekton pull-request.yaml: requirements_files: ["requirements.cpu.txt"]
- Tekton push.yaml: same update

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ysok

.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-pull-request.yaml

@@ -66,7 +66,7 @@ spec:
       type: pip
       binary:
         arch: "x86_64,aarch64,ppc64le"
-      requirements_files: ["requirements.txt"]
+      requirements_files: ["requirements.cpu.txt"]
     - path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-import-aid
       type: npm
     - path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-test-provider

.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-push.yaml

@@ -56,7 +56,7 @@ spec:
       type: pip
       binary:
         arch: "x86_64,aarch64,ppc64le"
-      requirements_files: ["requirements.txt"]
+      requirements_files: ["requirements.cpu.txt"]
     - path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-import-aid
       type: npm
     - path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-test-provider

codeserver/ubi9-python-3.12/Dockerfile.cpu

@@ -64,10 +64,13 @@ RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
 RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 
-# [HERMETIC] Configure package repos: local cachi2 repo for testing, or enable nodejs:22 module for Konflux.
+# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
+# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
+# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
 RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
         rm -f /etc/yum.repos.d/* && \
-        dnf config-manager --add-repo file:///cachi2/output/deps/rpm/; \
+        cp /cachi2/output/deps/rpm/"$(uname -m)"/repos.d/*.repo /etc/yum.repos.d/ && \
+        dnf module reset nodejs -y; \
     else \
         dnf module enable nodejs:22 -y; \
     fi;
@@ -174,11 +177,11 @@ RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 
 # [HERMETIC] Configure package repos for local testing (same pattern as rpm-base and cpu-base).
-# In Konflux, cachi2 injects repos automatically. In LOCAL_BUILD mode, we point dnf
-# at the local cachi2 repo so it can find openblas-threads (from codeready-builder).
+# In Konflux, cachi2 injects repos automatically. In LOCAL_BUILD mode, we copy the
+# hermeto-generated repo config so dnf can find openblas-threads (from codeready-builder).
 RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
         rm -f /etc/yum.repos.d/* && \
-        dnf config-manager --add-repo file:///cachi2/output/deps/rpm/; \
+        cp /cachi2/output/deps/rpm/"$(uname -m)"/repos.d/*.repo /etc/yum.repos.d/; \
     fi;
 
 # [HERMETIC] ppc64le/s390x: install system-level deps.
@@ -198,15 +201,13 @@ EOF
 
 # [HERMETIC] Git metadata (may be needed by setuptools-scm for version detection in sdist builds).
 COPY .git /root/.git
-# All arches: requirements and devel script (script is a no-op on all arches; kept for WHEEL_DIR setup)
-COPY ${CODESERVER_SOURCE_CODE}/pylock.toml ./
 
 # copy requirements and scripts
 COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
 
-# [HERMETIC] requirements.txt is generated by cachi2 from pyproject.toml with pinned hashes.
+# [HERMETIC] requirements.<flavor>.txt is generated by create-requirements-lockfile.sh with pinned hashes.
 # Previously we used pylock.toml directly; now cachi2 needs requirements.txt format.
-COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
+COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
 COPY ${CODESERVER_SOURCE_CODE}/devel_env_setup.sh ./
 
 # [HERMETIC] Install uv + install all Python packages from cachi2 pip cache.
@@ -272,7 +273,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 # Node.js is needed at runtime for code-server.
 RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
         rm -f /etc/yum.repos.d/* && \
-        dnf config-manager --add-repo file:///cachi2/output/deps/rpm/; \
+        cp /cachi2/output/deps/rpm/"$(uname -m)"/repos.d/*.repo /etc/yum.repos.d/ && \
+        dnf module reset nodejs -y; \
     else \
         dnf module enable nodejs:22 -y; \
     fi;
@@ -484,9 +486,9 @@ ENV PYTHONPATH=/opt/app-root/bin/python3
 # Install useful packages from pylock file
 COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
 
-# [HERMETIC] Install Python packages from cachi2 pip cache (requirements.txt format).
+# [HERMETIC] Install Python packages from cachi2 pip cache (requirements.<flavor>.txt format).
 # Previously used pylock.toml; cachi2 prefetch generates requirements.txt with hashes.
-COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
+COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
 
 # Wait for whl-cache stage (builds/caches Python wheels).
 COPY --from=whl-cache /tmp/control /dev/null

codeserver/ubi9-python-3.12/Dockerfile.vath

@@ -49,9 +49,9 @@ COPY ${CODESERVER_SOURCE_CODE}/pylock.toml ./
 # copy requirements and scripts
 COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
 
-# [HERMETIC] requirements.txt is generated by cachi2 from pyproject.toml with pinned hashes.
+# [HERMETIC] requirements.<flavor>.txt is generated by create-requirements-lockfile.sh with pinned hashes.
 # Previously we used pylock.toml directly; now cachi2 needs requirements.txt format.
-COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
+COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
 COPY ${CODESERVER_SOURCE_CODE}/devel_env_setup.sh ./
 
 # [HERMETIC] Install uv + install all Python packages (--network=none).