[pim/akonadi-e2e-tests] /: Don't hardcode paths
Ben Cooksley <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit e6a9f5954110921c1a5b6537423a3f9e66f7feed by Ben Cooksley.
Committed on 15/08/2026 at 04:37.
Pushed by bcooksley into branch 'master'.
Don't hardcode paths
M +10 -9 .gitlab-ci.yml
https://invent.kde.org/pim/akonadi-e2e-tests/-/commit/e6a9f5954110921c1a5b6537423a3f9e66f7feed
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 382dd1d..f755aaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,8 @@ lint:
when: never
- when: always
variables:
- PYTHONPATH: /builds/pim/akonadi-e2e-tests/_install/lib64/python3.13/site-packages
- LD_LIBRARY_PATH: /builds/pim/akonadi-e2e-tests/_install/lib64
+ PYTHONPATH: $CI_PROJECT_DIR/_install/lib64/python3.13/site-packages
+ LD_LIBRARY_PATH: $CI_PROJECT_DIR/_install/lib64
script:
- git config --global --add safe.directory $CI_PROJECT_DIR
- python3 -u ci-utilities/run-ci-build.py --project $CI_PROJECT_NAME --branch $CI_COMMIT_REF_NAME --platform Linux/Qt6/Shared --only-setup-environment
@@ -93,8 +93,8 @@ e2e_tests:
rules:
- when: always
variables:
- PYTHONPATH: /builds/pim/akonadi-e2e-tests/_install/lib64/python3.13/site-packages
- LD_LIBRARY_PATH: /builds/pim/akonadi-e2e-tests/_install/lib64
+ PYTHONPATH: $CI_PROJECT_DIR/_install/lib64/python3.13/site-packages
+ LD_LIBRARY_PATH: $CI_PROJECT_DIR/_install/lib64
DOCKER_IMAGE_PREFIX: invent-registry.kde.org/pim/akonadi-e2e-tests/
TESTCONTAINERS_RYUK_DISABLED: true
QT_QPA_PLATFORM: offscreen
@@ -107,14 +107,15 @@ e2e_tests:
- systemctl --user enable --now podman.socket
- export DOCKER_HOST="unix:///run/user/$(id -u)/podman/podman.sock"
- export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE="/run/user/$(id -u)/podman/podman.sock"
- - export PATH=/builds/pim/akonadi-e2e-tests/_install/bin:$PATH
- - export LD_LIBRARY_PATH=/builds/pim/akonadi-e2e-tests/_install/lib64
- - export XDG_DATA_DIRS=/builds/pim/akonadi-e2e-tests/_install/share:$XDG_DATA_DIRS
- - export QT_PLUGIN_PATH=/builds/pim/akonadi-e2e-tests/_install/lib64/plugins:/builds/pim/akonadi-e2e-tests/_install/lib/plugins:$QT_PLUGIN_PATH
+ - export PATH=$CI_PROJECT_DIR/_install/bin:$PATH
+ - export LD_LIBRARY_PATH=$CI_PROJECT_DIR/_install/lib64
+ - export XDG_DATA_DIRS=$CI_PROJECT_DIR/_install/share:$XDG_DATA_DIRS
+ - export QT_PLUGIN_PATH=$CI_PROJECT_DIR/_install/lib64/plugins:$CI_PROJECT_DIR/_install/lib/plugins:$QT_PLUGIN_PATH
+ - export PYTHONPATH=$PWD/_install/lib64/python3.13/site-packages/
- export DISPLAY=:90
# The path to the binaries in the .service files are wrong because of a relocation issue during run-ci.py
# So we have to replace it with the right path for services to start properly.
- - sed -i -e 's|/builds/[^ ]*/_install|/builds/pim/akonadi-e2e-tests/_install|g' /builds/pim/akonadi-e2e-tests/_install/share/dbus-1/services/*.service
+ - sed -i -e 's|/builds/[^ ]*/_install|$CI_PROJECT_DIR/_install|g' $CI_PROJECT_DIR/_install/share/dbus-1/services/*.service
- mkdir $XDG_DATA_HOME/kwalletd
- cp ci/kdewallet.{kwl,salt} "$XDG_DATA_HOME/kwalletd/"
- Xvfb -ac :90 >/tmp/xvfb.log 2>&1 &