aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-14 22:21:29 -0400
committerSimon Glass <sjg@chromium.org>2021-10-21 12:50:48 -0600
commite2d6a77a8fb0ea72eef5591648e90056ce4a75cd (patch)
treeabf9e8af4fa52d43fcbafe6a209275f460a322bc
parentf200a4bcecf1be6d8b546f0eb6af6403c93d80dd (diff)
downloadu-boot-e2d6a77a8fb0ea72eef5591648e90056ce4a75cd.zip
u-boot-e2d6a77a8fb0ea72eef5591648e90056ce4a75cd.tar.gz
u-boot-e2d6a77a8fb0ea72eef5591648e90056ce4a75cd.tar.bz2
CI: Switch running the nokia_rx51 test with in-container toolchain
Instead of fetching an arm toolchain to use, run the test with the one that's already in the container image. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
-rw-r--r--.azure-pipelines.yml3
-rw-r--r--.gitlab-ci.yml3
2 files changed, 2 insertions, 4 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 2ca146c..b3794a9 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -169,8 +169,7 @@ jobs:
options: $(container_option)
steps:
- script: |
- ./tools/buildman/buildman --fetch-arch arm
- export PATH=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/:$PATH
+ export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH
test/nokia_rx51_test.sh
- job: test_py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 699ce99..e7c65eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,8 +177,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites:
Run tests for Nokia RX-51 (aka N900):
stage: testsuites
script:
- - ./tools/buildman/buildman --fetch-arch arm;
- export PATH=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/:$PATH;
+ - export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH;
test/nokia_rx51_test.sh
# Test sandbox with test.py