[nrf noup] jenkinsfile: Multiple fixes

- In order to ensure that we use a compatible revision of ci-tools, fix
the SHA of the repo to a version we know is compatible.

- Use the Zephyr SDK instead of the GNU Arm Embedded toolchain.

- Add retries on sanitycheck for unstable builds

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit f3c37a8)
(cherry picked from commit 47aa027)
Signed-off-by: Martí Bolívar <[email protected]>

Author: carlescufi

Jenkinsfile

@@ -1,5 +1,6 @@
 def IMAGE_TAG = "ncs-toolchain:1.08"
 def REPO_CI_TOOLS = "https://github.com/zephyrproject-rtos/ci-tools.git"
+def REPO_CI_TOOLS_SHA = "9f4dc0be401c2b1e9b1c647513fb996bd8abd057"
 
 pipeline {
   agent {
@@ -25,19 +26,26 @@ pipeline {
 
       // ENVs for sanitycheck
       ARCH = "-a arm"
-      SANITYCHECK_OPTIONS_ALL = "--inline-logs --enable-coverage -N"
+      SANITYCHECK_OPTIONS = "--inline-logs --enable-coverage -N"
+      SANITYCHECK_RETRY = "--only-failed --outdir=out-2nd-pass"
+      SANITYCHECK_RETRY_2 = "--only-failed --outdir=out-3rd-pass"
 
       // ENVs for building (triggered by sanitycheck)
-      ZEPHYR_TOOLCHAIN_VARIANT = 'gnuarmemb'
+      ZEPHYR_TOOLCHAIN_VARIANT = 'zephyr'
       GNUARMEMB_TOOLCHAIN_PATH = '/workdir/gcc-arm-none-eabi-7-2018-q2-update'
+      ZEPHYR_SDK_INSTALL_DIR = '/opt/zephyr-sdk'
   }
 
   stages {
     stage('Checkout repositories') {
       steps {
         dir("ci-tools") {
           git branch: "master", url: "$REPO_CI_TOOLS"
+          sh "git checkout ${REPO_CI_TOOLS_SHA}"
         }
+	dir('zephyr') {
+          sh "git rev-parse HEAD"
+	}
 
         // Initialize west
         sh "west init -l zephyr/"
@@ -55,8 +63,13 @@ pipeline {
               script {
                 // If we're a pull request, compare the target branch against the current HEAD (the PR)
                 if (env.CHANGE_TARGET) {
-                  COMMIT_RANGE = "origin/${env.CHANGE_TARGET}..HEAD"
-		  COMPLIANCE_ARGS = "$COMPLIANCE_ARGS $COMPLIANCE_REPORT_ARGS"
+                  COMMIT_RANGE = "origin/$CHANGE_TARGET..HEAD"
+                  COMPLIANCE_ARGS = "$COMPLIANCE_ARGS $COMPLIANCE_REPORT_ARGS"
+                  sh "echo change id: $CHANGE_ID"
+                  sh "echo git commit: $GIT_COMMIT"
+                  sh "echo commit range: $COMMIT_RANGE"
+                  sh "git rev-parse origin/$CHANGE_TARGET"
+                  sh "git rev-parse HEAD"
                 }
                 // If not a PR, it's a non-PR-branch or master build. Compare against the origin.
                 else {
@@ -78,7 +91,13 @@ pipeline {
         stage('Sanitycheck (all)') {
           steps {
             dir('zephyr') {
-              sh "source zephyr-env.sh && ./scripts/sanitycheck $SANITYCHECK_OPTIONS_ALL $ARCH"
+              sh "echo variant: $ZEPHYR_TOOLCHAIN_VARIANT"
+              sh "echo SDK dir: $ZEPHYR_SDK_INSTALL_DIR"
+              sh "cat /opt/zephyr-sdk/sdk_version"
+	      sh "source zephyr-env.sh && \
+                  (./scripts/sanitycheck $SANITYCHECK_OPTIONS $ARCH || \
+                  (sleep 10; ./scripts/sanitycheck $SANITYCHECK_OPTIONS $SANITYCHECK_RETRY) || \
+                  (sleep 10; ./scripts/sanitycheck $SANITYCHECK_OPTIONS $SANITYCHECK_RETRY_2))"
             }
           }
         }