From 6598ce5a4645b3ce321bbfc6fd9bdbe63d7ae7dc Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 16 Mar 2020 15:55:08 +0000 Subject: [PATCH] CI: bump container tags to 2020-03-16 --- .ci/Jenkinsfile-SITL_tests | 4 +-- .ci/Jenkinsfile-SITL_tests_ASan | 4 +-- .ci/Jenkinsfile-SITL_tests_coverage | 6 ++-- .ci/Jenkinsfile-compile | 12 ++++---- .ci/Jenkinsfile-hardware | 22 +++++++-------- .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, 60 insertions(+), 60 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index b689ae0beb..15f0b168b0 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-01-13' + image 'px4io/px4-dev-ros-melodic:2020-03-16' 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:2020-01-13").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-03-16").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 769102e54a..0c00799cc8 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-01-13' + image 'px4io/px4-dev-ros-melodic:2020-03-16' 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:2020-01-13").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-03-16").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 4ab4c738dc..7759c4b816 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:2020-01-13' + image 'px4io/px4-dev-base-bionic:2020-03-16' 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:2020-01-13' + image 'px4io/px4-dev-base-bionic:2020-03-16' 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:2020-01-13").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-03-16").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 b9d1846c3f..15356697e3 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-01-13", - base: "px4io/px4-dev-base-bionic:2020-01-13", - nuttx: "px4io/px4-dev-nuttx:2020-01-13", - snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-01-13" + armhf: "px4io/px4-dev-armhf:2020-03-16", + base: "px4io/px4-dev-base-bionic:2020-03-16", + nuttx: "px4io/px4-dev-nuttx:2020-03-16", + snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-03-16" ] def armhf_builds = [ @@ -98,7 +98,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + // docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } // } // options { // skipDefaultCheckout() @@ -132,7 +132,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-01-13') { + if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-03-16') { bypass_entrypoint = ' --entrypoint=""' } diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index 14f202a1b4..b02a304f1a 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:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' 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:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' 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:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -222,7 +222,7 @@ pipeline { stage("build px4_fmu-v4_optimized") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -295,7 +295,7 @@ pipeline { stage("build px4_fmu-v4pro_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -368,7 +368,7 @@ pipeline { stage("build px4_fmu-v5_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -441,7 +441,7 @@ pipeline { stage("build px4_fmu-v5_optimized") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -514,7 +514,7 @@ pipeline { stage("build modalai_fc-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -587,7 +587,7 @@ pipeline { stage("build holybro_durandal-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -661,7 +661,7 @@ pipeline { stage("build holybro_durandal-v1_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -748,7 +748,7 @@ pipeline { stage("build nxp_fmuk66-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 70da8f6aef..6571591d66 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx:2020-01-13 + - image: px4io/px4-dev-nuttx:2020-03-16 steps: - checkout - run: diff --git a/.github/workflows/bloaty.yml b/.github/workflows/bloaty.yml index 5f54599ecc..634349022d 100644 --- a/.github/workflows/bloaty.yml +++ b/.github/workflows/bloaty.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx:2020-01-13 + container: px4io/px4-dev-nuttx:2020-03-16 strategy: matrix: config: [ diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 91205b13de..8df3408a5a 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-bionic:2020-01-13 + container: px4io/px4-dev-base-bionic:2020-03-16 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3e9e1d3205..9050ad7c13 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-bionic:2020-01-13 + container: px4io/px4-dev-base-bionic:2020-03-16 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml index 2a812dd785..1be51ea0e2 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-01-13 + container: px4io/px4-dev-armhf:2020-03-16 strategy: matrix: config: [ diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 852ecfc1b5..c879069533 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:2020-01-13 + container: px4io/px4-dev-nuttx:2020-03-16 strategy: matrix: config: [ diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index 59a836c9cf..314351713a 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-simulation-bionic:2020-01-29 + container: px4io/px4-dev-simulation-bionic:2020-03-16 steps: - uses: actions/checkout@v1 with: diff --git a/Jenkinsfile b/Jenkinsfile index 16f0d4f295..f9715308b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage('Catkin build on ROS workspace') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2020-01-13' + image 'px4io/px4-dev-ros-melodic:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -52,7 +52,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-dashing:2020-01-13' + image 'px4io/px4-dev-ros2-dashing:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -83,7 +83,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh 'make check_format' @@ -98,7 +98,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -124,7 +124,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -150,7 +150,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-01-13' + image 'px4io/px4-dev-base-bionic:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -190,7 +190,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2020-01-13' + image 'px4io/px4-dev-clang:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -228,7 +228,7 @@ pipeline { stage('Clang tidy') { agent { docker { - image 'px4io/px4-dev-clang:2020-01-13' + image 'px4io/px4-dev-clang:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -250,7 +250,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2020-01-13' + image 'px4io/px4-dev-ros-melodic:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -288,7 +288,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -308,7 +308,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -327,7 +327,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2020-01-13' + image 'px4io/px4-dev-base-bionic:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -352,7 +352,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh 'make distclean' @@ -371,7 +371,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh 'make distclean' @@ -390,7 +390,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh 'make distclean' @@ -410,7 +410,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-13' + image 'px4io/px4-dev-nuttx:2020-03-16' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -439,7 +439,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') @@ -469,7 +469,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') @@ -497,7 +497,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') @@ -525,7 +525,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') @@ -554,7 +554,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') @@ -597,7 +597,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } + docker { image 'px4io/px4-dev-base-bionic:2020-03-16' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index b894525533..fb869cfa09 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-11-25" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2020-03-16" 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-25" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-03-16" elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then # eagle, excelsior - PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-01-13" + PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-03-16" 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" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-03-16" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-11-25" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-03-16" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2019-11-25" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-03-16" 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-11-25" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2020-03-16" fi # docker hygiene