Message ID | 20191031134310.3072-17-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show |
Series | scripts: Convert to Python 3 | expand |
On Thu, Oct 31, 2019 at 07:43:06AM -0600, Simon Glass wrote: > This is a test to see if it removes the error here: > > https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/jobs/24304 > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > .gitlab-ci.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 9b295ac710..acbd1207c0 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -73,7 +73,7 @@ build all 64bit ARM platforms: > tags: [ 'all' ] > stage: world build > script: > - - virtualenv /tmp/venv > + - virtualenv -p /usr/bin/python3 /tmp/venv > - . /tmp/venv/bin/activate > - pip install pyelftools > - ret=0; > @@ -158,7 +158,7 @@ Run binman, buildman, dtoc and patman testsuites: > - git config --global user.name "GitLab CI Runner"; > git config --global user.email trini@konsulko.com; > export USER=gitlab; > - virtualenv /tmp/venv; > + virtualenv -p /usr/bin/python3 /tmp/venv; > . /tmp/venv/bin/activate; > pip install pyelftools; > export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl; With everything converted to python3, yes, we'll want to make "python" be "python3" and can/should undo a little of what I did in the test.py series to move virtualenv to after the buildman step.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b295ac710..acbd1207c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ build all 64bit ARM platforms: tags: [ 'all' ] stage: world build script: - - virtualenv /tmp/venv + - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate - pip install pyelftools - ret=0; @@ -158,7 +158,7 @@ Run binman, buildman, dtoc and patman testsuites: - git config --global user.name "GitLab CI Runner"; git config --global user.email trini@konsulko.com; export USER=gitlab; - virtualenv /tmp/venv; + virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; pip install pyelftools; export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl;
This is a test to see if it removes the error here: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/jobs/24304 Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)