From 8273b61c965e351bf04675790835a0fc5b470e14 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Fri, 17 Apr 2020 09:58:02 +0100 Subject: [PATCH 1/5] ci: bump container tags to 2020-04-02 --- .ci/Jenkinsfile-SITL_tests | 4 +-- .ci/Jenkinsfile-SITL_tests_ASan | 4 +-- .ci/Jenkinsfile-SITL_tests_coverage | 6 ++-- .ci/Jenkinsfile-compile | 12 ++++---- .ci/Jenkinsfile-hardware | 20 ++++++------- .circleci/config.yml | 2 +- .github/workflows/bloaty.yml | 2 +- .github/workflows/build_tests.yml | 2 +- .github/workflows/ccpp.yml | 2 +- .github/workflows/compile_linux.yml | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .github/workflows/sitl_tests.yml | 2 +- Jenkinsfile | 44 ++++++++++++++--------------- Tools/docker_run.sh | 14 ++++----- 14 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index a0ee091e8e6c..102cd3c44eb2 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:2020-04-01' + image 'px4io/px4-dev-ros-melodic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -133,7 +133,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-04-02").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 49227683c9f7..15f5fdc9ff91 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:2020-04-01' + image 'px4io/px4-dev-ros-melodic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -134,7 +134,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-04-02").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 bf9d007fb475..0292f69dcbd7 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -96,7 +96,7 @@ pipeline { stage('code coverage (python)') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-01' + image 'px4io/px4-dev-base-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -116,7 +116,7 @@ pipeline { stage('unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-01' + image 'px4io/px4-dev-base-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -154,7 +154,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-04-02").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 54d184e6a19c..e6f5ca0a3eb3 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:2020-04-01", - base: "px4io/px4-dev-base-bionic:2020-04-01", - nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-01", - snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01" + armhf: "px4io/px4-dev-armhf:2020-04-02", + base: "px4io/px4-dev-base-bionic:2020-04-02", + nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-02", + snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-02" ] def armhf_builds = [ @@ -101,7 +101,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + // docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } // } // options { // skipDefaultCheckout() @@ -135,7 +135,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) { // TODO: fix the snapdragon image bypass_entrypoint = '' - if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-01') { + if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-02') { bypass_entrypoint = ' --entrypoint=""' } diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index af1d44ef7167..582ccc2af1f1 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-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -80,7 +80,7 @@ pipeline { stage("build px4_fmu-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -154,7 +154,7 @@ pipeline { stage("build px4_fmu-v4_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -227,7 +227,7 @@ pipeline { stage("build px4_fmu-v4pro_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -301,7 +301,7 @@ pipeline { stage("build px4_fmu-v5_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -375,7 +375,7 @@ pipeline { stage("build px4_fmu-v5_optimized") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -448,7 +448,7 @@ pipeline { stage("build px4_fmu-v5_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -523,7 +523,7 @@ pipeline { stage("build modalai_fc-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -596,7 +596,7 @@ pipeline { stage("build holybro_durandal-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -671,7 +671,7 @@ pipeline { stage("build nxp_fmuk66-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 071a66a1f781..be3b69d0ada8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx-bionic:2020-04-01 + - image: px4io/px4-dev-nuttx-bionic:2020-04-02 steps: - checkout - run: diff --git a/.github/workflows/bloaty.yml b/.github/workflows/bloaty.yml index 273a1ba014a8..9d92eaf7e99d 100644 --- a/.github/workflows/bloaty.yml +++ b/.github/workflows/bloaty.yml @@ -26,7 +26,7 @@ jobs: px4_fmu-v5x_default, px4_io-v2_default, ] - container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-04-01 + container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-04-02 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 453e461155c8..8227b8f7c001 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -17,7 +17,7 @@ jobs: bionic, focal ] - container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01 + container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-02 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ade62c10dd84..c52b1f2083bf 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -17,7 +17,7 @@ jobs: bionic, focal ] - container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01 + container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-02 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml index 2172ca833af8..c26e71e5a56e 100644 --- a/.github/workflows/compile_linux.yml +++ b/.github/workflows/compile_linux.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-armhf:2020-04-01 + container: px4io/px4-dev-armhf:2020-04-02 strategy: matrix: config: [ diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 7755762bd4cc..6ccd5711b078 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-bionic:2020-04-01 + container: px4io/px4-dev-nuttx-bionic:2020-04-02 strategy: matrix: config: [ diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index 3fef85d145d0..a7f6ad465dac 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -18,7 +18,7 @@ jobs: focal ] container: - image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-04-01 + image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-04-02 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 diff --git a/Jenkinsfile b/Jenkinsfile index 703983e7a13e..2de8036618f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { // stage('Catkin build on ROS workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros-melodic:2020-04-01' + // image 'px4io/px4-dev-ros-melodic:2020-04-02' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -53,7 +53,7 @@ pipeline { // stage('Colcon build on ROS2 workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros2-dashing:2020-04-01' + // image 'px4io/px4-dev-ros2-dashing:2020-04-02' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -84,7 +84,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh 'make check_format' @@ -99,7 +99,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -125,7 +125,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -151,7 +151,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-01' + image 'px4io/px4-dev-base-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -191,7 +191,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2020-04-01' + image 'px4io/px4-dev-clang:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -229,7 +229,7 @@ pipeline { stage('Clang tidy') { agent { docker { - image 'px4io/px4-dev-clang:2020-04-01' + image 'px4io/px4-dev-clang:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -251,7 +251,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2020-04-01' + image 'px4io/px4-dev-ros-melodic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -289,7 +289,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -309,7 +309,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -328,7 +328,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-01' + image 'px4io/px4-dev-base-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -353,7 +353,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh 'make distclean' @@ -372,7 +372,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh 'make distclean' @@ -391,7 +391,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh 'make distclean' @@ -411,7 +411,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-01' + image 'px4io/px4-dev-nuttx-bionic:2020-04-02' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -440,7 +440,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') @@ -470,7 +470,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') @@ -498,7 +498,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') @@ -526,7 +526,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') @@ -555,7 +555,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') @@ -598,7 +598,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-01' } + docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index 6a0a7bb9e8c7..532452b0b7ea 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-bionic:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-02" 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:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-02" elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then # eagle, excelsior - PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-01" + PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-02" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-02" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-02" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-02" 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-bionic:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-02" fi # docker hygiene From 1afb7d947e7137477491c0e69ae37bd7337a0746 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Fri, 17 Apr 2020 10:02:04 +0100 Subject: [PATCH 2/5] Tools: setup scripts: arch: update arm gcc toolchain to 9-2019-q4-major --- Tools/setup/arch.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Tools/setup/arch.sh b/Tools/setup/arch.sh index 9ed9a6b293be..17fdca96ac17 100644 --- a/Tools/setup/arch.sh +++ b/Tools/setup/arch.sh @@ -90,7 +90,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then sudo pacman -R modemmanager --noconfirm # arm-none-eabi-gcc - NUTTX_GCC_VERSION="7-2017-q4-major" + NUTTX_GCC_VERSION="9-2019-q4-major-x86_64" GCC_VER_STR=$(arm-none-eabi-gcc --version) STATUSRETVAL=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}") @@ -98,17 +98,26 @@ if [[ $INSTALL_NUTTX == "true" ]]; then echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation" else echo "Installing arm-none-eabi-gcc-${NUTTX_GCC_VERSION}"; - wget -O /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 && \ + wget -O /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 && \ sudo tar -jxf /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 -C /opt/; # add arm-none-eabi-gcc to user's PATH - exportline="export PATH=/opt/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}/bin:\$PATH" + exportline="export PATH=\/opt\/gcc-arm-none-eabi-" + exportline_with_version="export PATH=/opt/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}/bin:\$PATH" - if grep -Fxq "$exportline" $HOME/.profile; + if grep -q "$exportline" $HOME/.profile; then - echo "${NUTTX_GCC_VERSION} path already set."; + existing_export_line="$(grep -q "$NUTTX_GCC_VERSION" $HOME/.profile)" | tr -d '\n' + if [[ $existing_export_line == $exportline_with_version ]]; + then + echo "A previous version was already set. Updating path..." + sed "/${exportline}/d" $HOME/.profile + echo $exportline_with_version >> $HOME/.profile + else + echo "${NUTTX_GCC_VERSION} path already set."; + fi else - echo $exportline >> $HOME/.profile; + echo $exportline_with_version >> $HOME/.profile fi fi fi From 60a97d861426c9827e23b7c22798c4ae3cd39291 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Fri, 17 Apr 2020 12:04:02 +0100 Subject: [PATCH 3/5] Tools: setup scripts: ubuntu: update arm gcc toolchain to 9-2019-q4-major --- Tools/setup/ubuntu.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh index 5a9e2bdc3ba0..c6cf3da46596 100755 --- a/Tools/setup/ubuntu.sh +++ b/Tools/setup/ubuntu.sh @@ -139,7 +139,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then fi # arm-none-eabi-gcc - NUTTX_GCC_VERSION="7-2017-q4-major" + NUTTX_GCC_VERSION="9-2019-q4-major-x86_64" if [ $(which arm-none-eabi-gcc) ]; then GCC_VER_STR=$(arm-none-eabi-gcc --version) @@ -151,17 +151,26 @@ fi else echo "Installing arm-none-eabi-gcc-${NUTTX_GCC_VERSION}"; - wget -O /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 && \ + wget -O /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 && \ sudo tar -jxf /tmp/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}-linux.tar.bz2 -C /opt/; # add arm-none-eabi-gcc to user's PATH - exportline="export PATH=/opt/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}/bin:\$PATH" + exportline="export PATH=\/opt\/gcc-arm-none-eabi-" + exportline_with_version="export PATH=/opt/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}/bin:\$PATH" - if grep -Fxq "$exportline" $HOME/.profile; + if grep -q "$exportline" $HOME/.profile; then - echo "${NUTTX_GCC_VERSION} path already set."; + existing_export_line="$(grep -q "$NUTTX_GCC_VERSION" $HOME/.profile)" | tr -d '\n' + if [[ $existing_export_line == $exportline_with_version ]]; + then + echo "A previous version was already set. Updating path..." + sed "/${exportline}/d" $HOME/.profile + echo $exportline_with_version >> $HOME/.profile + else + echo "${NUTTX_GCC_VERSION} path already set."; + fi else - echo $exportline >> $HOME/.profile; + echo $exportline_with_version >> $HOME/.profile fi fi From 64969bc39e396be686a03e59e1f6d9fb1b4025fe Mon Sep 17 00:00:00 2001 From: TSC21 Date: Sat, 6 Jun 2020 14:22:50 +0100 Subject: [PATCH 4/5] CI: bump container tags to 2020-05-28 --- .ci/Jenkinsfile-SITL_tests | 4 +-- .ci/Jenkinsfile-SITL_tests_ASan | 4 +-- .ci/Jenkinsfile-SITL_tests_coverage | 6 ++-- .ci/Jenkinsfile-compile | 12 ++++---- .ci/Jenkinsfile-hardware | 20 ++++++------- .circleci/config.yml | 2 +- .github/workflows/bloaty.yml | 2 +- .github/workflows/build_tests.yml | 2 +- .github/workflows/ccpp.yml | 2 +- .github/workflows/compile_linux.yml | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .github/workflows/sitl_tests.yml | 2 +- Jenkinsfile | 44 ++++++++++++++--------------- Tools/docker_run.sh | 14 ++++----- 14 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 102cd3c44eb2..053bf19ef609 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:2020-04-02' + image 'px4io/px4-dev-ros-melodic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -133,7 +133,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-02").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-05-28").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 15f5fdc9ff91..3a9fa4dd052c 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:2020-04-02' + image 'px4io/px4-dev-ros-melodic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -134,7 +134,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-02").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-05-28").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 0292f69dcbd7..3849c058db3d 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -96,7 +96,7 @@ pipeline { stage('code coverage (python)') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-02' + image 'px4io/px4-dev-base-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -116,7 +116,7 @@ pipeline { stage('unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-02' + image 'px4io/px4-dev-base-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -154,7 +154,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2020-04-02").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-05-28").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 e6f5ca0a3eb3..51204870ba30 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:2020-04-02", - base: "px4io/px4-dev-base-bionic:2020-04-02", - nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-02", - snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-02" + armhf: "px4io/px4-dev-armhf:2020-05-28", + base: "px4io/px4-dev-base-bionic:2020-05-28", + nuttx: "px4io/px4-dev-nuttx-bionic:2020-05-28", + snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-05-28" ] def armhf_builds = [ @@ -101,7 +101,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + // docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } // } // options { // skipDefaultCheckout() @@ -135,7 +135,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) { // TODO: fix the snapdragon image bypass_entrypoint = '' - if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-02') { + if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-05-28') { bypass_entrypoint = ' --entrypoint=""' } diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index 582ccc2af1f1..23f08f146f69 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-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -80,7 +80,7 @@ pipeline { stage("build px4_fmu-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -154,7 +154,7 @@ pipeline { stage("build px4_fmu-v4_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -227,7 +227,7 @@ pipeline { stage("build px4_fmu-v4pro_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -301,7 +301,7 @@ pipeline { stage("build px4_fmu-v5_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -375,7 +375,7 @@ pipeline { stage("build px4_fmu-v5_optimized") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -448,7 +448,7 @@ pipeline { stage("build px4_fmu-v5_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -523,7 +523,7 @@ pipeline { stage("build modalai_fc-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -596,7 +596,7 @@ pipeline { stage("build holybro_durandal-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -671,7 +671,7 @@ pipeline { stage("build nxp_fmuk66-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index be3b69d0ada8..db27b5985f4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx-bionic:2020-04-02 + - image: px4io/px4-dev-nuttx-bionic:2020-05-28 steps: - checkout - run: diff --git a/.github/workflows/bloaty.yml b/.github/workflows/bloaty.yml index 9d92eaf7e99d..60898f92acf6 100644 --- a/.github/workflows/bloaty.yml +++ b/.github/workflows/bloaty.yml @@ -26,7 +26,7 @@ jobs: px4_fmu-v5x_default, px4_io-v2_default, ] - container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-04-02 + container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-05-28 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 8227b8f7c001..138c8433f6c0 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -17,7 +17,7 @@ jobs: bionic, focal ] - container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-02 + container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-05-28 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c52b1f2083bf..501ab097b924 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -17,7 +17,7 @@ jobs: bionic, focal ] - container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-02 + container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-05-28 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml index c26e71e5a56e..75c88f60ea14 100644 --- a/.github/workflows/compile_linux.yml +++ b/.github/workflows/compile_linux.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-armhf:2020-04-02 + container: px4io/px4-dev-armhf:2020-05-28 strategy: matrix: config: [ diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 6ccd5711b078..cce091a2097f 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-bionic:2020-04-02 + container: px4io/px4-dev-nuttx-bionic:2020-05-28 strategy: matrix: config: [ diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index a7f6ad465dac..a04aedd5bb23 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -18,7 +18,7 @@ jobs: focal ] container: - image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-04-02 + image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-05-28 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 diff --git a/Jenkinsfile b/Jenkinsfile index 2de8036618f6..a65e3753f51b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { // stage('Catkin build on ROS workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros-melodic:2020-04-02' + // image 'px4io/px4-dev-ros-melodic:2020-05-28' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -53,7 +53,7 @@ pipeline { // stage('Colcon build on ROS2 workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros2-dashing:2020-04-02' + // image 'px4io/px4-dev-ros2-dashing:2020-05-28' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -84,7 +84,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh 'make check_format' @@ -99,7 +99,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -125,7 +125,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -151,7 +151,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-02' + image 'px4io/px4-dev-base-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -191,7 +191,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2020-04-02' + image 'px4io/px4-dev-clang:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -229,7 +229,7 @@ pipeline { stage('Clang tidy') { agent { docker { - image 'px4io/px4-dev-clang:2020-04-02' + image 'px4io/px4-dev-clang:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -251,7 +251,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2020-04-02' + image 'px4io/px4-dev-ros-melodic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -289,7 +289,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -309,7 +309,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -328,7 +328,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-04-02' + image 'px4io/px4-dev-base-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -353,7 +353,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh 'make distclean' @@ -372,7 +372,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh 'make distclean' @@ -391,7 +391,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh 'make distclean' @@ -411,7 +411,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx-bionic:2020-04-02' + image 'px4io/px4-dev-nuttx-bionic:2020-05-28' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -440,7 +440,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') @@ -470,7 +470,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') @@ -498,7 +498,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') @@ -526,7 +526,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') @@ -555,7 +555,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') @@ -598,7 +598,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-04-02' } + docker { image 'px4io/px4-dev-base-bionic:2020-05-28' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index 532452b0b7ea..abdfb728d26b 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-bionic:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-05-28" 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:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-05-28" elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then # eagle, excelsior - PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-02" + PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-05-28" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-05-28" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-05-28" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-05-28" 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-bionic:2020-04-02" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-05-28" fi # docker hygiene From 7df136e585da1ea55540b2d606e6bc6e3ab510a2 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Sat, 6 Jun 2020 14:26:00 +0100 Subject: [PATCH 5/5] VehicleIMU.cpp: fix format --- src/modules/sensors/vehicle_imu/VehicleIMU.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sensors/vehicle_imu/VehicleIMU.cpp b/src/modules/sensors/vehicle_imu/VehicleIMU.cpp index 3187fcdf3c62..34350a4604d9 100644 --- a/src/modules/sensors/vehicle_imu/VehicleIMU.cpp +++ b/src/modules/sensors/vehicle_imu/VehicleIMU.cpp @@ -219,7 +219,7 @@ void VehicleIMU::Run() // rotate sensor clip counts into vehicle body frame const Vector3f clipping{_accel_corrections.getBoardRotation() * - Vector3f{(float)accel.clip_counter[0], (float)accel.clip_counter[1], (float)accel.clip_counter[2]}}; + Vector3f{(float)accel.clip_counter[0], (float)accel.clip_counter[1], (float)accel.clip_counter[2]}}; // round to get reasonble clip counts per axis (after board rotation) const uint8_t clip_x = roundf(fabsf(clipping(0)));