From e4180f6a72fb71c13f8cedf92b9e95f785fe33ce Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 15 Dec 2017 09:55:34 -0500
Subject: [PATCH] Jenkins split GCC 7 posix & nuttx tests

 - this groups the builds together properly
---
 Jenkinsfile | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5c27440267..72273b58e7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -175,8 +175,8 @@ pipeline {
           }
 
 
-          // GCC7 tests
-          for (def option in ["posix_sitl_default", "nuttx_px4fmu-v5_default"]) {
+          // GCC7 posix
+          for (def option in ["sitl_default"]) {
             def node_name = "${option}"
 
             builds["${node_name} (GCC7)"] = {
@@ -187,7 +187,28 @@ pipeline {
                       checkout scm
                       sh "make clean"
                       sh "ccache -z"
-                      sh "make ${node_name}"
+                      sh "make posix_${node_name}"
+                      sh "ccache -s"
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          // GCC7 nuttx
+          for (def option in ["px4fmu-v5_default"]) {
+            def node_name = "${option}"
+
+            builds["${node_name} (GCC7)"] = {
+              node {
+                stage("Build Test ${node_name} (GCC7)") {
+                  docker.image('px4io/px4-dev-base-archlinux:2017-12-08').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
+                    stage("${node_name}") {
+                      checkout scm
+                      sh "make clean"
+                      sh "ccache -z"
+                      sh "make nuttx_${node_name}"
                       sh "ccache -s"
                     }
                   }