From e2d6a77a8fb0ea72eef5591648e90056ce4a75cd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 14 Oct 2021 22:21:29 -0400 Subject: [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 Reviewed-by: Simon Glass Tested-by: Simon Glass --- .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 2ca146c0fd..b3794a956e 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 699ce991fb..e7c65ebbce 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.39.5