diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-11-07 16:28:57 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-08 20:12:57 +0000 |
| commit | 57cae6062acd7e2f1d009fb2ba43e9fc701a0ce8 (patch) | |
| tree | 4d78ff121604a1688bdd6366ab06d04dc70269fe | |
| parent | 5c7a034ffcebd3b392fede60e8a3896685f40d58 (diff) | |
| download | chrome-ec-57cae6062acd7e2f1d009fb2ba43e9fc701a0ce8.tar.gz | |
gitlab: Remove twister workarounds
Twister should use toolchain host and set the toolchain dir to zephyr
by default in gitlab now.
BRANCH=None
BUG=None
TEST=Ran gitlab runner locally on zephyr_coverage and
zephyr_boards_coverage
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I8b8d14f21722e42bc903303b98cf185ea68b198e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4011463
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77d7d0a3a7..bc8dea37fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,10 +83,6 @@ before_script: # Build directory - export BUILD_DIR=${EC_DIR}/build - export TWISTER_OUT_DIR=${EC_DIR}/twister-out - # Set up Twister to use the "host" toolchain, as defined in upstream Zephyr - # repo, ultimately including ${ZEPHYR_BASE}/cmake/toolchain/host/generic.cmake - - export TOOLCHAIN_ROOT=${ZEPHYR_BASE} - - export ZEPHYR_TOOLCHAIN_VARIANT=host # Users of this template must set: # $PROJECT to the project to build. E.g., "lazor" @@ -295,7 +291,7 @@ zephyr_coverage: needs: [] script: - python3 ${EC_DIR}/twister --coverage --outdir "${TWISTER_OUT_DIR}" - -v -i --gcov-tool gcov -x=ALLOW_WARNINGS=ON + -v -i -x=ALLOW_WARNINGS=ON artifacts: paths: - ec_dir/twister-out/coverage.info |