]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
gitlab-ci: Prepend to PATH rather than replace it
authorTom Rini <trini@konsulko.com>
Thu, 24 Oct 2019 15:59:17 +0000 (11:59 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 30 Oct 2019 21:48:46 +0000 (17:48 -0400)
Currently we set the entire PATH rather than prepend the new paths that
we need to have searched.  This however breaks parts of the "virtualenv"
that was have set up and need to use as that also will be modifying
PATH.  To fix this, prepend our new locations instead.

Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
.gitlab-ci.yml

index b91b5f67af98ed09b04f164b8922fac8bab4e52a..ab294997e46393c47d1f3f31319e6cd446bb061c 100644 (file)
@@ -48,7 +48,7 @@ stages:
     # "-k something" even when $TEST_PY_TEST_SPEC doesnt need a custom
     # value.
     - 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 PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH};
       export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
       if [[ "${TEST_PY_BD}" != "" ]]; then
         ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID}