diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-26 07:52:29 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-04-29 03:23:39 -0700 |
| commit | 38229b55d30d7eb0b72ce4e00b34487bebb9a40f (patch) | |
| tree | c1653e5b122bd02d90b5e7a91ce0fcc55365ab60 | |
| parent | 494a5e126b4de48091a161436839647246b29d29 (diff) | |
Azure/GitLab: Ensure we use requirements.txt for testsuites
Given that test/py/requirements.txt has all required test modules, make
use of that rather than a manual pip install list before running our
assorted tool testsuites.
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d176e045e1..59e99b8894 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -144,7 +144,7 @@ jobs: export USER=azure virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate - pip install pyelftools pytest pygit2 + pip install -r test/py/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51bd64308a..bff487404f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,7 +151,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: export USER=gitlab; virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; - pip install pyelftools pytest pygit2; + pip install -r test/py/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; |