diff mbox series

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

Message ID 20210226125231.7476-3-trini@konsulko.com
State Under Review
Delegated to: Simon Glass
Headers show
Series [1/5] GitLab: Remove "tags" stanzas | expand

Commit Message

Tom Rini Feb. 26, 2021, 12:52 p.m. UTC
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>
---
 .azure-pipelines.yml | 2 +-
 .gitlab-ci.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Bin Meng Feb. 26, 2021, 2:25 p.m. UTC | #1
On Fri, Feb 26, 2021 at 8:53 PM Tom Rini <trini@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@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
Tom Rini Feb. 26, 2021, 2:31 p.m. UTC | #2
On Fri, Feb 26, 2021 at 10:25:30PM +0800, Bin Meng wrote:
> On Fri, Feb 26, 2021 at 8:53 PM Tom Rini <trini@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@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?

Not since:
commit f4a60b036308ca4a0a3ad08587b7f9b72d3565d5
Author: Igor Opaniuk <igor.opaniuk@foundries.io>
Date:   Mon Jan 25 14:28:41 2021 +0200

    test: py: add pygit2 and pyelftools to requirements.txt
Bin Meng Feb. 27, 2021, 12:55 a.m. UTC | #3
On Fri, Feb 26, 2021 at 10:31 PM Tom Rini <trini@konsulko.com> wrote:
>
> On Fri, Feb 26, 2021 at 10:25:30PM +0800, Bin Meng wrote:
> > On Fri, Feb 26, 2021 at 8:53 PM Tom Rini <trini@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@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?
>
> Not since:
> commit f4a60b036308ca4a0a3ad08587b7f9b72d3565d5
> Author: Igor Opaniuk <igor.opaniuk@foundries.io>
> Date:   Mon Jan 25 14:28:41 2021 +0200
>
>     test: py: add pygit2 and pyelftools to requirements.txt

Ah, yes! Was looking at an old branch.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff mbox series

Patch

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
           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}";