Update Jenkins File

Author: iwahdan88

Jenkinsfile

@@ -1,7 +1,7 @@
 def buildVersion
 def boards_to_build = ["WiPy", "LoPy", "SiPy", "GPy", "FiPy", "LoPy4"]
 def variants_to_build = [ "PYBYTES" ]
-def boards_to_test = ["1b6fa1", "00ec51"]
+def boards_to_test = ["00ec51"]
 def open_thread
 
 node {
@@ -30,21 +30,13 @@ node {
             for (variant in variants_to_build) {
                 board_variant = board + "_" + variant
                 open_thread = 'off'
-                // Enable openthread in case of FIPY/LoPy4/LoPy BASE builds
-                if (board == 'FiPy' || board == 'LoPy4' || board == 'LoPy')
-                {
-                    // openthread is currently disabled
-                    open_thread = 'off'
-                }
                 parallelSteps[board_variant] = boardBuild(board, variant, open_thread)
             }
             parallel parallelSteps
         }
     }
-
-    stash includes: '**/*.bin', name: 'binary'
+    stash includes: '**/*.tar.gz', name: 'binary'
     stash includes: 'tests/**', name: 'tests'
-    stash includes: 'esp-idf/components/esptool_py/**', name: 'esp-idfTools'
     stash includes: 'tools/**', name: 'tools'
     stash includes: 'esp32/tools/**', name: 'esp32Tools'
 }
@@ -54,7 +46,7 @@ for (variant in variants_to_build) {
     stage ('Flash-' + variant) {
        def parallelFlash = [:]
        for (board in boards_to_test) {
-          parallelFlash[board] = flashBuild(board, variant)
+          parallelFlash[board] = flashBuild(board, PYCOM_VERSION, variant)
        }
        parallel parallelFlash
     }
@@ -69,54 +61,46 @@ for (variant in variants_to_build) {
 }
 
 def boardBuild(name, variant, open_thread) {
-    def name_u = name.toUpperCase()
-    def name_short = name_u.split('_')[0]
-    def app_bin = name.toLowerCase() + '.bin'
     return {
         release_dir = "${JENKINS_HOME}/release/${JOB_NAME}/" + PYCOM_VERSION + "/" + GIT_TAG + "/"
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
-        make -C esp32 clean BOARD=''' + name_short + ' VARIANT=' + variant + ' BUILD_DIR=build-' + variant
-
+        make -C esp32 clean BOARD=''' + name.toUpperCase() + ' VARIANT=' + variant
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
-        make -C esp32 -j2 release BOARD=''' + name_short + ' BUILD_DIR=build-' + variant + ' RELEASE_DIR=' + release_dir + variant + '/' + ' VARIANT=' + variant + ' OPENTHREAD=' + open_thread
-
-        sh 'mv esp32/build-' + variant + '/'+ name_u + '/release/application.elf ' + release_dir + variant + '/' + name + "-" + PYCOM_VERSION + '-application.elf'
+        make -C esp32 -j2 release BOARD=''' + name.toUpperCase() + ' VARIANT=' + variant + ' OPENTHREAD=' + open_thread
+        sh 'mkdir -p ' + release_dir + variant + '/' 
+        sh 'cp esp32/build-' + variant + '/' + name + '-' + PYCOM_VERSION + '.tar.gz ' + release_dir + variant + '/'
+        sh 'mv esp32/build-' + variant + '/' + name.toUpperCase() + '/release/application.elf ' + release_dir + variant + '/' + name + "-" + PYCOM_VERSION + '-application.elf'
     }
 }
 
-def flashBuild(short_name, variant) {
+def flashBuild(short_name, version, variant) {
   return {
     String device_name = get_device_name(short_name)
-    String board_name_u = get_firmware_name(short_name)
+    String board_name = get_firmware_name(short_name)
     node(get_remote_name(short_name)) {
       sh 'rm -rf *'
       unstash 'binary'
-      unstash 'esp-idfTools'
       unstash 'esp32Tools'
       unstash 'tests'
       unstash 'tools'
-      sh 'python esp32/tools/pypic.py --port ' + device_name +' --enter'
-      sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port ' + device_name +' --baud 921600 --before no_reset --after no_reset erase_flash'
-      sh 'python esp32/tools/pypic.py --port ' + device_name +' --enter'
-      sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port ' + device_name +' --baud 921600 --before no_reset --after no_reset write_flash -pz --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 esp32/build-' + variant + '/' + board_name_u +'/release/bootloader/bootloader.bin 0x8000 esp32/build-' + variant + '/' + board_name_u +'/release/lib/partitions.bin 0x10000 esp32/build-' + variant + '/' + board_name_u +'/release/' + board_name_u.toLowerCase() + '.bin'
-      sh 'python esp32/tools/pypic.py --port ' + device_name +' --exit'
+      sh 'python esp32/tools/fw_updater/updater.py --port ' + device_name +' flash -t esp32/build-' + variant + '/' + board_name + '-' + version + '.tar.gz'
     }
   }
 }
 
 def testBuild(short_name) {
   return {
     String device_name = get_device_name(short_name)
-    String board_name_u = get_firmware_name(short_name)
+    String board_name = get_firmware_name(short_name).toUpperCase()
     node(get_remote_name(short_name)) {
         sleep(5) //Delay to skip all bootlog
         dir('tests') {
             timeout(30) {
                 // As some tests are randomly failing... enforce script always returns 0 (OK)
                 sh '''export PATH=$PATH:/usr/local/bin;
-                ./run-tests --target=esp32-''' + board_name_u + ' --device ' + device_name + ' || exit 0'
+                ./run-tests --target=esp32 --device ''' + device_name + ' || exit 0'
             }
         }
         sh 'python esp32/tools/pypic.py --port ' + device_name +' --enter'
@@ -134,7 +118,7 @@ def get_firmware_name(short_name) {
   node {
 	def node_info = sh (script: 'cat ${JENKINS_HOME}/pycom-ic.conf || exit 0', returnStdout: true).trim()
 	def matcher = node_info =~ short_name + ':(.+):.*'
-    matcher ? matcher[0][1] : "WIPY"
+    matcher ? matcher[0][1] : "WiPy"
   }
 }