diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c27cb7c..441fd655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ### Fixed +## [4.13.1] - 2026-07-30 +### Fixed +- Fix jenkins agents python issues with UV ([#1167](https://github.com/opendevstack/ods-quickstarters/pull/1167)) + ## [4.13.0] - 2026-06-30 ### Added - Added config-rs to rust template ([#1162](https://github.com/opendevstack/ods-quickstarters/issues/1162)) diff --git a/common/jenkins-agents/python/docker/Dockerfile.ubi9 b/common/jenkins-agents/python/docker/Dockerfile.ubi9 index 012837d9..dbefc851 100644 --- a/common/jenkins-agents/python/docker/Dockerfile.ubi9 +++ b/common/jenkins-agents/python/docker/Dockerfile.ubi9 @@ -9,6 +9,7 @@ ENV PYTHONUNBUFFERED=1 \ PYTHONIOENCODING=UTF-8 \ UV_CA_CERTIFICATE=/etc/ssl/certs/ca-bundle.crt \ PIP_CERT=/etc/ssl/certs/ca-bundle.crt \ + PIP_BREAK_SYSTEM_PACKAGES=1 \ PATH=$HOME/.local/bin:$JAVA_HOME/bin:$PATH \ UV_VERSION=0.10.9 @@ -26,7 +27,7 @@ RUN yum install -y autoconf automake gcc gcc-c++ openssl-devel libffi-devel && \ fi && \ yum -y clean all -RUN PACKAGES="virtualenv==20.26.3 setuptools==72.2.0 Cython==3.0.11 pypandoc==1.13" && \ +RUN PACKAGES="pip==25.0.1 virtualenv==20.26.3 setuptools==72.2.0 Cython==3.0.11 pypandoc==1.13" && \ for pyVersion in 3.8 3.9 3.11 3.12; do \ uv python install $pyVersion && \ if [ -n "${nexusHost}" ] && [ -n "${nexusAuth}" ]; then \ diff --git a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi9 b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi9 index 289f0e63..4ff4f8de 100644 --- a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi9 +++ b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi9 @@ -79,13 +79,13 @@ RUN for pyVersion in 3.8 3.9 3.11; do \ uv python install $pyVersion && \ if [ -n "${nexusHost}" ] && [ -n "${nexusAuth}" ]; then \ uv pip install --system --break-system-packages --python $pyVersion --index-url https://${nexusAuth}@${nexusHost}/repository/pypi-all/simple --trusted-host ${nexusHost} --prerelease=allow \ - virtualenv \ - pycodestyle \ + virtualenv==20.26.3 \ + pycodestyle==2.12.1 \ -r /tmp/requirements.txt; \ else \ uv pip install --system --break-system-packages --python $pyVersion --prerelease=allow \ - virtualenv \ - pycodestyle \ + virtualenv==20.26.3 \ + pycodestyle==2.12.1 \ -r /tmp/requirements.txt; \ fi; \ done && \ diff --git a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi9 b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi9 index 43c6b83f..b8f5118a 100644 --- a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi9 +++ b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi9 @@ -79,13 +79,13 @@ RUN for pyVersion in 3.9 3.11 3.12; do \ uv python install $pyVersion && \ if [ -n "${nexusHost}" ] && [ -n "${nexusAuth}" ]; then \ uv pip install --system --break-system-packages --python $pyVersion --index-url https://${nexusAuth}@${nexusHost}/repository/pypi-all/simple --trusted-host ${nexusHost} --prerelease=allow \ - virtualenv \ - pycodestyle \ + virtualenv==20.26.3 \ + pycodestyle==2.12.1 \ -r /tmp/requirements.txt; \ else \ uv pip install --system --break-system-packages --python $pyVersion --prerelease=allow \ - virtualenv \ - pycodestyle \ + virtualenv==20.26.3 \ + pycodestyle==2.12.1 \ -r /tmp/requirements.txt; \ fi; \ done && \