diff options
| -rw-r--r-- | trigger-zephyr-upstream-arm.yaml | 2 | ||||
| -rw-r--r-- | trigger-zephyr-upstream.yaml | 2 | ||||
| -rw-r--r-- | zephyr-upstream-arm.yaml | 2 | ||||
| -rw-r--r-- | zephyr-upstream.yaml | 2 | ||||
| -rwxr-xr-x | zephyr-upstream/builders.sh | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/trigger-zephyr-upstream-arm.yaml b/trigger-zephyr-upstream-arm.yaml index 111f784d3d..5a4547ee6e 100644 --- a/trigger-zephyr-upstream-arm.yaml +++ b/trigger-zephyr-upstream-arm.yaml @@ -31,4 +31,4 @@ builders: - trigger-builds: - project: 'zephyr-upstream-arm' - predefined-parameters: GIT_REVISION=${GIT_REVISION} + predefined-parameters: GIT_COMMIT=${GIT_COMMIT} diff --git a/trigger-zephyr-upstream.yaml b/trigger-zephyr-upstream.yaml index 5bd1ba88b0..a04e05327c 100644 --- a/trigger-zephyr-upstream.yaml +++ b/trigger-zephyr-upstream.yaml @@ -31,4 +31,4 @@ builders: - trigger-builds: - project: 'zephyr-upstream' - predefined-parameters: GIT_REVISION=${GIT_REVISION} + predefined-parameters: GIT_COMMIT=${GIT_COMMIT} diff --git a/zephyr-upstream-arm.yaml b/zephyr-upstream-arm.yaml index 00655889e1..bfebfc1ea3 100644 --- a/zephyr-upstream-arm.yaml +++ b/zephyr-upstream-arm.yaml @@ -33,7 +33,7 @@ name: QA_SERVER default: 'https://qa-reports.linaro.org' - string: - name: GIT_REVISION + name: GIT_COMMIT default: '' disabled: false node: master diff --git a/zephyr-upstream.yaml b/zephyr-upstream.yaml index e89e551d8a..45acbfef7d 100644 --- a/zephyr-upstream.yaml +++ b/zephyr-upstream.yaml @@ -33,7 +33,7 @@ name: QA_SERVER default: 'https://qa-reports.linaro.org' - string: - name: GIT_REVISION + name: GIT_COMMIT default: '' disabled: false node: master diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh index 32bedae76c..1d6c2c596f 100755 --- a/zephyr-upstream/builders.sh +++ b/zephyr-upstream/builders.sh @@ -12,8 +12,8 @@ sudo pip3 install pyelftools pykwalify git clone --depth 1 -b ${BRANCH} https://git.linaro.org/lite/zephyr.git ${WORKSPACE} git clean -fdx -if [ -n "${GIT_REVISION}" ]; then - git reset --hard ${GIT_REVISION} +if [ -n "${GIT_COMMIT}" ]; then + git reset --hard ${GIT_COMMIT} fi echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters |