Merge pull request #2 from ARMmbed/jenkins_file_fix

Jenkin's file fix

Author: Hasnain Virk

Jenkinsfile

@@ -20,43 +20,41 @@ def raas = [
   ]
 
 // List of targets with supported modem families
-def targets = [
-  "UBLOX": ["UBLOX_C027", "UBLOX_C027"],
-  "MTS_DRAGONFLY": ["MTS_DRAGONFLY"]
+def target_families = [
+  "UBLOX": ["UBLOX_C027"],
+  "MTS_DRAGONFLY": ["MTS_DRAGONFLY_F411RE"]
   ]
 
 // Supported Modems
-def modems = [
-  "UBLOX_C027",
+def targets = [
   "UBLOX_C027",
-  "MTS_DRAGONFLY"
+  "UBLOX_C030",
+  "MTS_DRAGONFLY_F411RE"
 ]
 
 // Map toolchains to compilers
 def toolchains = [
   ARM: "armcc",
-  GCC_ARM: "arm-none-eabi-gcc",
-  IAR: "iar_arm"
+  GCC_ARM: "arm-none-eabi-gcc"//,
+  //IAR: "iar_arm"
   ]
 
 def stepsForParallel = [:]
 
 // Jenkins pipeline does not support map.each, we need to use oldschool for loop
-for (int i = 0; i < targets.size(); i++) {
+for (int i = 0; i < target_families.size(); i++) {
   for(int j = 0; j < toolchains.size(); j++) {
-      def target = targets.keySet().asList().get(i)
-      def allowed_modem_type = targets.get(target)
+    for(int k = 0; k < targets.size(); k++) {
+      def target_family = target_families.keySet().asList().get(i)
+      def allowed_target_type = target_families.get(target_family)
+      def target = targets.get(k)
       def toolchain = toolchains.keySet().asList().get(j)
       def compilerLabel = toolchains.get(toolchain)
 
-      // Skip unwanted combination
-      if (target == "NUCLEO_F401RE" && toolchain == "IAR") {
-        continue
+      def stepName = "${target_family} ${toolchain}"
+      if(allowed_target_type.contains(target)) {
+        stepsForParallel[stepName] = buildStep(target_family, target, compilerLabel, toolchain)
       }
-
-      def stepName = "${target} ${toolchain}"
-      if(allowed_modem_type.contains(modems)) {
-        stepsForParallel[stepName] = buildStep(target, compilerLabel, toolchain)
     }
   }
 }
@@ -81,23 +79,26 @@ timestamps {
   parallel parallelRunSmoke
 }
 
-def buildStep(target, compilerLabel, toolchain) {
+def buildStep(target_family, target, compilerLabel, toolchain) {
   return {
-    stage ("${target}_${compilerLabel}") {
+    stage ("${target_family}_${target}_${compilerLabel}") {
       node ("${compilerLabel}") {
         deleteDir()
         dir("mbed-os-example-cellular-minimal") {
           checkout scm
           def config_file = "mbed_app.json"
 
+           // Change target type
+          execute("sed -i 's/\"platform\": .*/\"platform\": \"${target_family}\"/' ${config_file}")
+
           // Activate traces
           execute("sed -i 's/\"mbed-trace.enable\": false/\"mbed-trace.enable\": true/' ${config_file}")
 
           // Set mbed-os to revision received as parameter
           execute ("mbed deploy --protocol ssh")
-          dir ("mbed-os") {
-            execute ("git checkout ${env.MBED_OS_REVISION}")
-          }
+          //dir ("mbed-os") {
+          //  execute ("git checkout ${env.MBED_OS_REVISION}")
+          //}
 
           execute ("mbed compile --build out/${target}_${toolchain}/ -m ${target} -t ${toolchain} -c --app-config ${config_file}")
         }

main.cpp

@@ -7,11 +7,10 @@
 #define MTS_DRAGONFLY   1
 
 #if MBED_CONF_APP_PLATFORM == UBLOX
-#include "UbloxCellularInterface.h"
-#include "ublox_low_level_api.h"
+#include "ublox_modem_driver/UbloxCellularInterface.h"
 UbloxCellularInterface *iface;
 #elif MBED_CONF_APP_PLATFORM == MTS_DRAGONFLY
-#include "DragonFlyCellularInterface.h"
+#include "dragonfly_modem_driver/DragonFlyCellularInterface.h"
 DragonFlyCellularInterface *iface;
 #endif
 #include "UDPSocket.h"

mbed-os.lib

@@ -1 +1 @@
-https://github.com/hasnainvirk/mbed-os/#f242cbf185efd5cc61ac831ff38ab43affe06df7
+https://github.com/hasnainvirk/mbed-os/#66fef4dce3728cb53dcc77bd1178abcceee4d1f7

mbed_app.json

@@ -1,7 +1,6 @@
 {
     "config": {
-        "platform": { "help": "Options: UBLOX, MTS_DRAGONFLY",
-        			  "value": "UBLOX"}
+        "platform": "UBLOX"
     },
     "macros": ["OS_MAINSTKSIZE=512"],
     "target_overrides": {