diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 3608b0eb7a..7d7820457d 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -8,7 +8,7 @@ pipeline { stage('Build') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2019-10-23' + image 'px4io/px4-dev-ros-melodic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -130,7 +130,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-10-24").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 index 933d321418..cc39f3e485 100644 --- 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-melodic:2019-10-23' + image 'px4io/px4-dev-ros-melodic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -131,7 +131,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-10-24").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_coverage b/.ci/Jenkinsfile-SITL_tests_coverage index 6da9f20d4d..5eba66cf49 100644 --- 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-10-04' + image 'px4io/px4-dev-base-bionic:2019-10-24' 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-10-04' + image 'px4io/px4-dev-base-bionic:2019-10-24' 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-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') { stage(test_def.name) { def test_ok = true sh('export') diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index af2b351b41..734afcc447 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,10 +9,10 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2019-10-04", - base: "px4io/px4-dev-base-bionic:2019-10-04", - nuttx: "px4io/px4-dev-nuttx:2019-10-04", - rpi: "px4io/px4-dev-raspi:2019-10-04", + armhf: "px4io/px4-dev-armhf:2019-10-24", + base: "px4io/px4-dev-base-bionic:2019-10-24", + nuttx: "px4io/px4-dev-nuttx:2019-10-24", + rpi: "px4io/px4-dev-raspi:2019-10-24", snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" ] @@ -82,7 +82,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + // docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } // } // options { // skipDefaultCheckout() diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index da52be49f1..652f2b95a4 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -11,7 +11,7 @@ pipeline { stage('px4_fmu-v2_test') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -35,7 +35,7 @@ pipeline { stage('px4_fmu-v3_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -59,7 +59,7 @@ pipeline { stage('px4_fmu-v4_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -83,7 +83,7 @@ pipeline { stage('px4_fmu-v4pro_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -107,7 +107,7 @@ pipeline { stage('px4_fmu-v5_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -131,7 +131,7 @@ pipeline { stage('px4_fmu-v5_critmonitor') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -155,7 +155,7 @@ pipeline { stage('px4_fmu-v5_irqmonitor') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -179,7 +179,7 @@ pipeline { stage('px4_fmu-v5_stackcheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -203,7 +203,7 @@ pipeline { stage('px4_fmu-v5x_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -227,7 +227,7 @@ pipeline { stage('nxp_fmuk66-v3_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index e21b669198..66d08d2f93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx:2019-07-29 + - image: px4io/px4-dev-nuttx:2019-10-24 steps: - checkout - run: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c900e46b46..3328e83e41 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-bionic:2019-07-29 + container: px4io/px4-dev-base-bionic:2019-10-24 steps: - uses: actions/checkout@v1 - name: make diff --git a/Jenkinsfile b/Jenkinsfile index dc69aad627..c5bb455d3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage('Catkin build on ROS workspace') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2019-10-04' + image 'px4io/px4-dev-ros-melodic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -51,7 +51,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-bouncy:2019-10-04' + image 'px4io/px4-dev-ros2-bouncy:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -82,7 +82,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh 'make check_format' @@ -97,7 +97,7 @@ pipeline { stage('px4_fmu-v2 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -130,7 +130,7 @@ pipeline { stage('px4_fmu-v5 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -163,7 +163,7 @@ pipeline { stage('px4_sitl (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -196,7 +196,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -222,7 +222,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -248,7 +248,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-10-04' + image 'px4io/px4-dev-base-bionic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -270,7 +270,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2019-10-04' + image 'px4io/px4-dev-clang:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -308,7 +308,7 @@ pipeline { // stage('Clang tidy') { // agent { // docker { - // image 'px4io/px4-dev-clang:2019-10-04' + // image 'px4io/px4-dev-clang:2019-10-24' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // } // } @@ -329,7 +329,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-10-04' + image 'px4io/px4-dev-base-bionic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -367,7 +367,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -387,7 +387,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -406,7 +406,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-10-04' + image 'px4io/px4-dev-base-bionic:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -431,7 +431,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh 'make distclean' @@ -450,7 +450,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh 'make distclean' @@ -469,7 +469,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh 'make distclean' @@ -489,7 +489,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-04' + image 'px4io/px4-dev-nuttx:2019-10-24' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -518,7 +518,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') @@ -548,7 +548,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') @@ -576,7 +576,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') @@ -604,7 +604,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') @@ -633,7 +633,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') @@ -674,7 +674,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } + docker { image 'px4io/px4-dev-base-bionic:2019-10-24' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index ec4f072aa1..e31073d130 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -4,22 +4,22 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then echo "guessing PX4_DOCKER_REPO based on input"; if [[ $@ =~ .*px4_fmu.* ]]; then # nuttx-px4fmu-v{1,2,3,4,5} - PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24" elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-07-29" + PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-10-24" elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then # eagle, excelsior PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" elif [[ $@ =~ .*ocpoc.* ]]; then # aerotennaocpoc_ubuntu - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-07-29" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-07-29" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-10-24" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-xenial:2019-10-04" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2019-10-24" fi else echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; @@ -27,7 +27,7 @@ fi # otherwise default to nuttx if [ -z ${PX4_DOCKER_REPO+x} ]; then - PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24" fi # docker hygiene