From 62a4c1f395eebb3d693df35514eabd6580bd0bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 19 Apr 2023 10:27:08 +0100 Subject: ci: pass --break-system-packages on Debian Sid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Debian Sid python packages block users from installing packages using pip unless using a venv. A venv has no benefit when we are running in a throwaway container which has no need for software upgrades. Signed-off-by: Daniel P. Berrangé --- .gitlab-ci.yml | 4 ++-- ci/gitlab/builds.yml | 2 ++ ci/manifest.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d97d5e0..f2518bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ stages: - ninja -C build install - popd - $PYTHON setup.py build - - $PYTHON -m pip install . + - $PYTHON -m pip ${PIP_INSTALL:-install} . - $PYTHON setup.py test - $PYTHON setup.py sdist - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; @@ -50,7 +50,7 @@ stages: - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" - export CFLAGS="-Werror" - $PYTHON setup.py build - - $PYTHON -m pip install . + - $PYTHON -m pip ${PIP_INSTALL:-install} . - $PYTHON setup.py test - $PYTHON setup.py sdist - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index a52108d..400268a 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -113,6 +113,7 @@ x86_64-debian-sid-prebuilt-env: allow_failure: true variables: NAME: debian-sid + PIP_INSTALL: install --break-system-packages x86_64-debian-sid-local-env: extends: .native_build_job_local_env @@ -121,6 +122,7 @@ x86_64-debian-sid-local-env: variables: IMAGE: docker.io/library/debian:sid-slim NAME: debian-sid + PIP_INSTALL: install --break-system-packages x86_64-fedora-36-prebuilt-env: diff --git a/ci/manifest.yml b/ci/manifest.yml index 5646ae3..7073d0d 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -44,6 +44,8 @@ targets: jobs: - arch: x86_64 allow-failure: true + variables: + PIP_INSTALL: install --break-system-packages fedora-36: jobs: -- cgit v1.2.1