[PATCH 3/5] Azure/GitLab: Ensure we use requirements.txt for testsuites

[Bin Meng]

On Fri, Feb 26, 2021 at 8:53 PM Tom Rini <trini at konsulko.com> wrote:
>
> 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 at konsulko.com>
> ---
>  .azure-pipelines.yml | 2 +-
>  .gitlab-ci.yml       | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
> index a6279427e138..0a4f90f75f3b 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

It seems only pytest is listed in 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 ceba5ce7a905..ce0e63481a11 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}";
> --

Regards,
Bin