Skip to contentSkip to conversation

azure: Update for python3 and current pytest

PATCH New Tom Rini 1 participant 3 messages Nov 1, 2019

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 azure: Update for python3 and current pytest

Similar to the rework for GitLab-CI and Travis-CI, rework the Azure Pipeline to use python3 and requirements.txt to install the necessary modules.

---
 .azure-pipelines.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
.azure-pipelines.yml +4 -6
index d476d8d0e94d..11d5a6175b0f 100644
@@ -1,7 +1,7 @@
 variables:
   windows_vm: vs2015-win2012r2
   ubuntu_vm: ubuntu-18.04
-  ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20190912.1-03Oct2019
+  ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20191010-20Oct2019
   # Add '-u 0' options for Azure pipelines, otherwise we get "permission
   # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer",
   # since our $(ci_runner_image) user is not root.
@@ -245,11 +245,6 @@ jobs:
           git clone --depth=1 git://github.com/swarren/uboot-test-hooks.git /tmp/uboot-test-hooks
           ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
           ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
-          virtualenv /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install pytest==2.8.7
-          pip install python-subunit
-          pip install coverage
           grub-mkimage --prefix=\"\" -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
           grub-mkimage --prefix=\"\" -o ~/grub_x64.efi -O x86_64-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
           mkdir ~/grub2-arm
@@ -266,6 +261,9 @@ jobs:
                   exit $ret;
               fi;
           fi
+          virtualenv -p /usr/bin/python3 /tmp/venv
+          . /tmp/venv/bin/activate
+          pip install -r test/py/requirements.txt
           export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD};
           export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin;
           export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/1 azure: Update for python3 and current pytest

Quoted 5 lines · Tom Rini

Similar to the rework for GitLab-CI and Travis-CI, rework the Azure Pipeline to use python3 and requirements.txt to install the necessary modules.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191101/10e0eeff/attachment.sig>
author
#2 lore raw

PATCH 1/1 azure: Update for python3 and current pytest

Quoted 9 lines · Tom Rini
Quoted 5 lines · Tom Rini

Similar to the rework for GitLab-CI and Travis-CI, rework the Azure Pipeline to use python3 and requirements.txt to install the necessary modules.

Applied to u-boot/master, thanks!

But I missed that it wasn't enough in all my testing branches yesterday. I see now that Azure copied the Travis/GitLab problem of overriding PATH not prepending PATH and so virtualenv PATH changes are wiped out, I'll fix this in a moment.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191101/1b688e11/attachment.sig>