diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 0255f573c88..69d4a5ebf2c 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-11-22' + image 'px4io/px4-dev-ros-melodic:2019-11-25' 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-11-22").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-11-25").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 1770830d17e..a4a07ef6a0d 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-11-22' + image 'px4io/px4-dev-ros-melodic:2019-11-25' 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-11-22").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-11-25").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 cb07daa039f..6bddb93200f 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-11-22' + image 'px4io/px4-dev-base-bionic:2019-11-25' 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-11-22' + image 'px4io/px4-dev-base-bionic:2019-11-25' 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-11-22").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2019-11-25").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 b683ac71ba4..8d2c66613e6 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,9 +9,9 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2019-11-22", - base: "px4io/px4-dev-base-bionic:2019-11-22", - nuttx: "px4io/px4-dev-nuttx:2019-11-22", + armhf: "px4io/px4-dev-armhf:2019-11-25", + base: "px4io/px4-dev-base-bionic:2019-11-25", + nuttx: "px4io/px4-dev-nuttx:2019-11-25", snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" ] @@ -70,7 +70,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + // docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } // } // options { // skipDefaultCheckout() diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index 45e9ceea8e9..708886a6bfc 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -12,7 +12,7 @@ pipeline { stage("build px4_fmu-v2_test") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -76,7 +76,7 @@ pipeline { stage("build px4_fmu-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -149,7 +149,7 @@ pipeline { stage("build px4_fmu-v4_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -222,7 +222,7 @@ pipeline { stage("build px4_fmu-v4pro_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -295,7 +295,7 @@ pipeline { stage("build px4_fmu-v5_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -385,7 +385,7 @@ pipeline { stage("build px4_fmu-v5x_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -545,7 +545,7 @@ pipeline { stage("build holybro_durandal-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -619,7 +619,7 @@ pipeline { stage("build holybro_durandal-v1_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -706,7 +706,7 @@ pipeline { stage("build nxp_fmuk66-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d8d52cacd1..f84fe96e2c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx:2019-11-22 + - image: px4io/px4-dev-nuttx:2019-11-25 steps: - checkout - run: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 02c1d2038e0..3227b243c5d 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-11-22 + container: px4io/px4-dev-base-bionic:2019-11-25 steps: - uses: actions/checkout@v1 with: diff --git a/Jenkinsfile b/Jenkinsfile index 9ebe6a0fc34..20106956ed9 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-11-22' + image 'px4io/px4-dev-ros-melodic:2019-11-25' 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-dashing:2019-11-22' + image 'px4io/px4-dev-ros2-dashing:2019-11-25' 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-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh 'make check_format' @@ -129,7 +129,7 @@ pipeline { stage('px4_fmu-v2 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -161,7 +161,7 @@ pipeline { stage('px4_fmu-v5 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -193,7 +193,7 @@ pipeline { stage('px4_sitl (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -225,7 +225,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -251,7 +251,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -277,7 +277,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-11-22' + image 'px4io/px4-dev-base-bionic:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -317,7 +317,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2019-11-22' + image 'px4io/px4-dev-clang:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -355,7 +355,7 @@ pipeline { stage('Clang tidy') { agent { docker { - image 'px4io/px4-dev-clang:2019-11-22' + image 'px4io/px4-dev-clang:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -377,7 +377,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-11-22' + image 'px4io/px4-dev-base-bionic:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -415,7 +415,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -435,7 +435,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -454,7 +454,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-11-22' + image 'px4io/px4-dev-base-bionic:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -479,7 +479,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh 'make distclean' @@ -498,7 +498,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh 'make distclean' @@ -517,7 +517,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh 'make distclean' @@ -537,7 +537,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2019-11-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -566,7 +566,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') @@ -596,7 +596,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') @@ -624,7 +624,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') @@ -652,7 +652,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') @@ -681,7 +681,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') @@ -722,7 +722,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-11-22' } + docker { image 'px4io/px4-dev-base-bionic:2019-11-25' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index a213f49e02a..c88ec66e9f7 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -4,19 +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-11-22" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-11-25" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]]; then # aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-11-22" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-11-25" elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then # eagle, excelsior PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" + elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then + # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-11-25" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-11-22" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-11-25" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2019-11-22" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2019-11-25" fi else echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; @@ -24,7 +27,7 @@ fi # otherwise default to nuttx if [ -z ${PX4_DOCKER_REPO+x} ]; then - PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-11-22" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-11-25" fi # docker hygiene