diff options
author | Kumar Gala <kumar.gala@linaro.org> | 2018-07-31 08:05:14 -0500 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-07-31 13:58:10 +0000 |
commit | 8a981b317c97f3b88e6e496d86115ffabdf652ea (patch) | |
tree | 72dba9c4e1087c9866350f1b373957639390f34a /zephyr-upstream.yaml | |
parent | 1a4f33eace39f5a2b08a6e973d148e882a77f1b7 (diff) |
zephyr-upstream: Update to use ZEPHYR_TOOLCHAIN_VARIANT
Zephyr has deprecated the env var ZEPHYR_GCC_VARIANT and replaced it
with ZEPHYR_TOOLCHAIN_VARIANT. Match this change in our CI scripts.
Change-Id: I0ef0c5c57db3c3e95170693feb6623227066d028
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
Diffstat (limited to 'zephyr-upstream.yaml')
-rw-r--r-- | zephyr-upstream.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zephyr-upstream.yaml b/zephyr-upstream.yaml index afb873b2..d1e66096 100644 --- a/zephyr-upstream.yaml +++ b/zephyr-upstream.yaml @@ -49,7 +49,7 @@ - docker-xenial-amd64-13 - axis: type: user-defined - name: ZEPHYR_GCC_VARIANT + name: ZEPHYR_TOOLCHAIN_VARIANT values: - gccarmemb - zephyr @@ -84,7 +84,7 @@ # - v2m_beetle execution-strategy: combination-filter: | - ZEPHYR_GCC_VARIANT=="zephyr" || (ZEPHYR_GCC_VARIANT=="gccarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86")) + ZEPHYR_TOOLCHAIN_VARIANT=="zephyr" || (ZEPHYR_TOOLCHAIN_VARIANT=="gccarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86")) wrappers: - timestamps - credentials-binding: @@ -119,7 +119,7 @@ time python ${HOME}/bin/linaro-cp.py \ --api_version 3 \ --link-latest \ - out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER} + out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER} - shell: | #!/bin/bash -ex @@ -157,7 +157,7 @@ --qa-server ${QA_SERVER} \ --qa-server-team lite \ --qa-server-project zephyr-upstream \ - --gcc-variant ${ZEPHYR_GCC_VARIANT} \ + --gcc-variant ${ZEPHYR_TOOLCHAIN_VARIANT} \ --git-commit ${GIT_COMMIT} publishers: |