Message ID | 20191101185533.9731-1-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 5d6f05352b69d4858a2a9e9136ac3a734f0222bb |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] azure: Update the script to prepend PATH not override PATH | expand |
On Fri, Nov 01, 2019 at 02:55:33PM -0400, Tom Rini wrote: > Similar to 90d3d78a1c68 ("gitlab-ci: Prepend to PATH rather than replace > it") we need to prepend the PATH with our additional binaries and not > replace the value fully as doing so breaks virtualenv. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 11d5a6175b0f..862cced1cc56 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -265,7 +265,7 @@ jobs: . /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 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} -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" --build-dir "$UBOOT_TRAVIS_BUILD_DIR";
Similar to 90d3d78a1c68 ("gitlab-ci: Prepend to PATH rather than replace it") we need to prepend the PATH with our additional binaries and not replace the value fully as doing so breaks virtualenv. Signed-off-by: Tom Rini <trini@konsulko.com> --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)