From e01c66bb467da9d215f6a623e3538ebc3d5703fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 29 Jan 2026 15:01:13 +0100 Subject: [PATCH] ci: set PYTHONPATH for the pmb module globally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Correa Gómez Part-of: --- .ci/pytest.sh | 2 +- .gitlab-ci.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.ci/pytest.sh b/.ci/pytest.sh index eba2a7212..d7b240e24 100755 --- a/.ci/pytest.sh +++ b/.ci/pytest.sh @@ -27,6 +27,6 @@ pmbootstrap config aports "$pmaports" pmbootstrap -q shutdown # Needed to import "common" -export PYTHONPATH=".ci/lib" +export PYTHONPATH="$PYTHONPATH:.ci/lib" # Run testcases pytest -vv --tb=native "$pmaports/.ci/testcases" "$@" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7db5b3749..076f335fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,9 @@ variables: # seems like a reasonable balance. If this is too low, git merge-base (from ci/ # common.py) can fail GIT_DEPTH: 100 + # So that anything that runs install_pmbootstrap and tries to import pmb module + # can find it. + PYTHONPATH: "/tmp/pmbootstrap" # This defines the rules for when a pipeline should run. workflow: @@ -178,7 +181,7 @@ generate-build-jobs: # HACK: Make the pmb library happy to use the currently-cloned pmaports repo - mkdir -p /root/.local/var/pmbootstrap/cache_git/ && ln -s $PWD /root/.local/var/pmbootstrap/cache_git/pmaports - - PYTHONPATH=/tmp/pmbootstrap/ .ci/lib/generate_build_jobs.py + - .ci/lib/generate_build_jobs.py artifacts: paths: