[PATCH] 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 --- .azure-pipelines.yml | 3 +-- .gitlab-ci.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 53f86f5184c5..d3352defef2e 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 5a3e2f0ceb85..4aeca31e198b 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

On Thu, 14 Oct 2021 at 20:21, Tom Rini trini@konsulko.com wrote:
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
.azure-pipelines.yml | 3 +-- .gitlab-ci.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
Works for me on gitlab!
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 53f86f5184c5..d3352defef2e 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 5a3e2f0ceb85..4aeca31e198b 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
2.25.1

On Thu, 14 Oct 2021 at 20:21, Tom Rini trini@konsulko.com wrote:
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
.azure-pipelines.yml | 3 +-- .gitlab-ci.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
Works for me on gitlab!
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
participants (2)
-
Simon Glass
-
Tom Rini