Skip to content

Commit d962b65

Browse files
thst-nordicmbolivar-nordic
authored andcommitted
[nrf noup] ci: add linux label to jenkins agent
Required now that we have windows agents. also fix stray tabs->spaces Signed-off-by: Thomas Stilwell <[email protected]> (cherry picked from commit 98e9dc7) (cherry picked from commit a7c0185) Signed-off-by: Martí Bolívar <[email protected]>
1 parent 1ba0071 commit d962b65

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66
agent {
77
docker {
88
image "$IMAGE_TAG"
9-
label "docker && build-node && ncs"
9+
label "docker && build-node && ncs && linux"
1010
args '-e PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/workdir/.local/bin'
1111
}
1212
}
@@ -43,9 +43,9 @@ pipeline {
4343
git branch: "master", url: "$REPO_CI_TOOLS"
4444
sh "git checkout ${REPO_CI_TOOLS_SHA}"
4545
}
46-
dir('zephyr') {
46+
dir('zephyr') {
4747
sh "git rev-parse HEAD"
48-
}
48+
}
4949

5050
// Initialize west
5151
sh "west init -l zephyr/"
@@ -94,7 +94,7 @@ pipeline {
9494
sh "echo variant: $ZEPHYR_TOOLCHAIN_VARIANT"
9595
sh "echo SDK dir: $ZEPHYR_SDK_INSTALL_DIR"
9696
sh "cat /opt/zephyr-sdk/sdk_version"
97-
sh "source zephyr-env.sh && \
97+
sh "source zephyr-env.sh && \
9898
(./scripts/sanitycheck $SANITYCHECK_OPTIONS $ARCH || \
9999
(sleep 10; ./scripts/sanitycheck $SANITYCHECK_OPTIONS $SANITYCHECK_RETRY) || \
100100
(sleep 10; ./scripts/sanitycheck $SANITYCHECK_OPTIONS $SANITYCHECK_RETRY_2))"

0 commit comments

Comments
 (0)