diff options
| -rw-r--r-- | trigger-zephyr-upstream-arm.yaml | 1 | ||||
| -rw-r--r-- | trigger-zephyr-upstream.yaml | 1 | ||||
| -rw-r--r-- | zephyr-upstream-arm.yaml | 3 | ||||
| -rw-r--r-- | zephyr-upstream.yaml | 3 | ||||
| -rwxr-xr-x | zephyr-upstream/builders.sh | 3 |
5 files changed, 11 insertions, 0 deletions
diff --git a/trigger-zephyr-upstream-arm.yaml b/trigger-zephyr-upstream-arm.yaml index e571bbcc1f..111f784d3d 100644 --- a/trigger-zephyr-upstream-arm.yaml +++ b/trigger-zephyr-upstream-arm.yaml @@ -31,3 +31,4 @@ builders: - trigger-builds: - project: 'zephyr-upstream-arm' + predefined-parameters: GIT_REVISION=${GIT_REVISION} diff --git a/trigger-zephyr-upstream.yaml b/trigger-zephyr-upstream.yaml index f693a1d3bc..5bd1ba88b0 100644 --- a/trigger-zephyr-upstream.yaml +++ b/trigger-zephyr-upstream.yaml @@ -31,3 +31,4 @@ builders: - trigger-builds: - project: 'zephyr-upstream' + predefined-parameters: GIT_REVISION=${GIT_REVISION} diff --git a/zephyr-upstream-arm.yaml b/zephyr-upstream-arm.yaml index 4ca3e2d075..00655889e1 100644 --- a/zephyr-upstream-arm.yaml +++ b/zephyr-upstream-arm.yaml @@ -32,6 +32,9 @@ - string: name: QA_SERVER default: 'https://qa-reports.linaro.org' + - string: + name: GIT_REVISION + default: '' disabled: false node: master child-workspace: . diff --git a/zephyr-upstream.yaml b/zephyr-upstream.yaml index 5a034eca72..e89e551d8a 100644 --- a/zephyr-upstream.yaml +++ b/zephyr-upstream.yaml @@ -32,6 +32,9 @@ - string: name: QA_SERVER default: 'https://qa-reports.linaro.org' + - string: + name: GIT_REVISION + default: '' disabled: false node: master child-workspace: . diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh index 810d4fe508..32bedae76c 100755 --- a/zephyr-upstream/builders.sh +++ b/zephyr-upstream/builders.sh @@ -12,6 +12,9 @@ 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} +fi echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters head -5 Makefile |