From 05dc2ba3ecf443c7188f92b8dafb1912aa7e2da5 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 10 Feb 2019 17:33:17 -0500 Subject: [PATCH] update px4 dev containers to 2019-02-09 - this updates all containers except for px4-dev-snapdragon --- .ci/Jenkinsfile-SITL_tests | 8 +++--- .ci/Jenkinsfile-SITL_tests_coverage | 8 +++--- .ci/Jenkinsfile-compile | 12 ++++----- .ci/Jenkinsfile-hardware | 2 +- Jenkinsfile | 42 ++++++++++++++--------------- Tools/docker_run.sh | 12 ++++----- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 921354f354..8601f603af 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -8,8 +8,8 @@ pipeline { stage('Build') { agent { docker { - image 'px4io/px4-dev-ros-kinetic:2018-09-11' - args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE --entrypoint=""' + image 'px4io/px4-dev-ros-kinetic:2019-02-09' + args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } steps { @@ -100,7 +100,7 @@ pipeline { } options { - buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14')) + buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '14')) timeout(time: 60, unit: 'MINUTES') } } // pipeline @@ -109,7 +109,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE --entrypoint=""') { + docker.image("px4io/px4-dev-ros-kinetic:2019-02-09").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 index 5eac9933f0..3c498f6418 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -72,7 +72,7 @@ pipeline { stage('code coverage (python)') { agent { docker { - image 'px4io/px4-dev-base:2019-02-03' + image 'px4io/px4-dev-base:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -91,7 +91,7 @@ pipeline { stage('unit tests') { agent { docker { - image 'px4io/px4-dev-base:2019-02-03' + image 'px4io/px4-dev-base:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -119,7 +119,7 @@ pipeline { } options { - buildDiscarder(logRotator(numToKeepStr: '2', artifactDaysToKeepStr: '14')) + buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14')) timeout(time: 60, unit: 'MINUTES') } } // pipeline @@ -128,7 +128,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE --entrypoint=""') { + docker.image("px4io/px4-dev-ros-kinetic:2019-02-09").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 0b6650ac2b..3d9c31bf57 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,11 +9,11 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2019-01-27", - base: "px4io/px4-dev-base:2019-01-26", - nuttx: "px4io/px4-dev-nuttx:2019-01-27", - ros: "px4io/px4-dev-ros:2019-01-27", - rpi: "px4io/px4-dev-raspi:2019-01-27", + armhf: "px4io/px4-dev-armhf:2019-02-09", + base: "px4io/px4-dev-base:2019-02-09", + nuttx: "px4io/px4-dev-nuttx:2019-02-09", + ros: "px4io/px4-dev-ros-kinetic:2019-02-09", + rpi: "px4io/px4-dev-raspi:2019-02-09", snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" ] @@ -81,7 +81,7 @@ pipeline { // TODO: actually upload artifacts to S3 stage('S3 Upload') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } options { skipDefaultCheckout() diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index 4b8bfda84f..60e55ddc3a 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -9,7 +9,7 @@ pipeline { stage('px4_fmu-v4_default') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-02-03' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/Jenkinsfile b/Jenkinsfile index 76cc6abea5..6581522690 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,7 +75,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh 'make check_format' @@ -90,7 +90,7 @@ pipeline { stage('Bloaty px4_fmu-v2') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-01-27' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -118,7 +118,7 @@ pipeline { stage('Bloaty px4_fmu-v5') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-01-27' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -146,7 +146,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base:2019-02-03' + image 'px4io/px4-dev-base:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -168,7 +168,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2019-01-27' + image 'px4io/px4-dev-clang:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -205,7 +205,7 @@ pipeline { // stage('Clang tidy') { // agent { // docker { - // image 'px4io/px4-dev-clang:2019-01-27' + // image 'px4io/px4-dev-clang:2019-02-09' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // } // } @@ -226,7 +226,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-base:2019-01-26' + image 'px4io/px4-dev-base:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -263,7 +263,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-01-27' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -282,7 +282,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-01-27' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -301,7 +301,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base:2019-01-26' + image 'px4io/px4-dev-base:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -326,7 +326,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh 'make distclean' @@ -345,7 +345,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh 'make distclean' @@ -364,7 +364,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh 'make distclean' @@ -384,7 +384,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-01-27' + image 'px4io/px4-dev-nuttx:2019-02-09' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -413,7 +413,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -443,7 +443,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -471,7 +471,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -499,7 +499,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base:2019-01-27' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -522,7 +522,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base:2019-01-27' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -553,7 +553,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base:2019-01-26' } + docker { image 'px4io/px4-dev-base:2019-02-09' } } steps { sh('export') @@ -590,7 +590,7 @@ pipeline { GIT_COMMITTER_NAME = "PX4BuildBot" } options { - buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '30')) + buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30')) timeout(time: 60, unit: 'MINUTES') } } diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index 17fe94ca9f..940d0427a2 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-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09" elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-02-09" 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-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-02-09" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-02-09" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-02-09" 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-01-27" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09" fi # docker hygiene