Merge remote-tracking branch 'px4/master' into pr-temperature_compens…

…ation_clean_up
PX4 · Sep 15, 2019 · 13415c6 · 13415c6
2 parents 6bb7d2e + d4f984f
commit 13415c6
Show file tree

Hide file tree

Showing 1,000 changed files with 26,943 additions and 19,152 deletions.
diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests
@@ -8,7 +8,7 @@ pipeline {
     stage('Build') {
       agent {
         docker {
-          image 'px4io/px4-dev-ros-kinetic:2019-03-08'
+          image 'px4io/px4-dev-ros-kinetic:2019-07-29'
           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
         }
       }
@@ -93,6 +93,13 @@ pipeline {
               vehicle: "iris_obs_avoid",
               run_script: "rostest_avoidance_run.sh"
             ],
+            [
+              name: "MC_safe_landing",
+              test: "mavros_posix_test_safe_landing.test",
+              mission: "MC_safe_landing",
+              vehicle: "iris_obs_avoid",
+              run_script: "rostest_avoidance_run.sh"
+            ],
 
           ]
 
@@ -123,7 +130,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-kinetic:2019-07-29").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
           def test_ok = true

diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan
@@ -8,7 +8,7 @@ pipeline {
     stage('Build') {
       agent {
         docker {
-          image 'px4io/px4-dev-ros-kinetic:2019-03-08'
+          image 'px4io/px4-dev-ros-kinetic:2019-07-29'
           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
         }
       }
@@ -117,7 +117,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-kinetic:2019-07-29").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def test_ok = true
           sh('export')

diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage
@@ -79,7 +79,7 @@ pipeline {
         stage('code coverage (python)') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
+              image 'px4io/px4-dev-base-bionic:2019-07-29'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -99,7 +99,7 @@ pipeline {
         stage('unit tests') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
+              image 'px4io/px4-dev-base-bionic:2019-07-29'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-kinetic:2019-07-29").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def test_ok = true
           sh('export')

diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
@@ -9,11 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2019-03-08",
-            base: "px4io/px4-dev-base-bionic:2019-03-08",
-            nuttx: "px4io/px4-dev-nuttx:2019-03-08",
-            ros: "px4io/px4-dev-ros-kinetic:2019-03-08",
-            rpi: "px4io/px4-dev-raspi:2019-03-08",
+            armhf: "px4io/px4-dev-armhf:2019-07-29",
+            base: "px4io/px4-dev-base-bionic:2019-07-29",
+            nuttx: "px4io/px4-dev-nuttx:2019-07-29",
+            rpi: "px4io/px4-dev-raspi:2019-07-29",
             snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
           ]
 
@@ -36,9 +35,9 @@ pipeline {
                      "px4_fmu-v4_default",
                      "px4_fmu-v4pro_default",
                      "px4_fmu-v5_default", "px4_fmu-v5_fixedwing", "px4_fmu-v5_multicopter", "px4_fmu-v5_rover", "px4_fmu-v5_rtps", "px4_fmu-v5_stackcheck",
-                     "px4_fmu-v5x_default", "px4_fmu-v5x_fixedwing", "px4_fmu-v5x_multicopter", "px4_fmu-v5x_rover", "px4_fmu-v5x_rtps", "px4_fmu-v5x_stackcheck",
+                     "px4_fmu-v5x_default",
                      "intel_aerofc-v1_default", "auav_x21_default", "av_x-v1_default", "bitcraze_crazyflie_default", "airmind_mindpx-v2_default",
-                     "nxp_fmuk66-v3_default", "omnibus_f4sd_default", "holybro_kakutef7"],
+                     "holybro_kakutef7", "mro_ctrl-zero-f7_default", "nxp_fmuk66-v3_default", "omnibus_f4sd_default", "uvify_core_default"],
             image: docker_images.nuttx,
             archive: true
           ]
@@ -82,7 +81,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
+    //     docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
     //   }
     //   options {
     //         skipDefaultCheckout()